Merge pull request #51 from izumin5210/wakwak3125/update-build-tools

Update old dependencies
izumin5210 · Jan 1, 2018 · 758dba8 · 758dba8
2 parents d7fb23a + 8fd51f6
commit 758dba8
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,14 +3,16 @@ jdk: oraclejdk8
 android:
   components:
     - tools
-    - build-tools-23.0.2
-    - android-23
+    - build-tools-27.0.3
+    - android-27
     - extra-android-support
     - extra-android-m2repository
   licenses:
     - 'android-sdk-preview-license-52d11cd2'
     - 'android-sdk-license-.+'
     - 'google-gdk-license-.+'
+before_install:
+  - yes | sdkmanager "platforms;android-27"
 cache:
   directories:
     - $HOME/.gradle/caches/

diff --git a/README.md b/README.md
@@ -33,19 +33,13 @@ Droidux depends on [RxJava][rxjava] and [Data Binding][databinding].
 Add to your project build.gradle file:
 
 ```groovy
-buildscript {
-  dependencies {
-    classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
-  }
-}
 
 apply plugin: 'com.android.application'
-apply plugin: 'com.neenbedankt.android-apt'
 
 dependencies {
   compile 'io.reactivex:rxjava:1.1.0'
   compile 'info.izumin.android:droidux:0.6.0'
-  apt 'info.izumin.android:droidux-processor:0.6.0'
+  annotationProcessor 'info.izumin.android:droidux-processor:0.6.0'
 }
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -4,12 +4,14 @@ buildscript {
     repositories {
         jcenter()
         maven { url "https://jitpack.io" }
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
-        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath 'com.novoda:bintray-release:0.3.4'
-        classpath 'me.tatarka:gradle-retrolambda:3.2.3'
         classpath 'com.github.groovy:groovy-android-gradle-plugin:1b77dd6763'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -20,6 +22,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
@@ -33,8 +36,8 @@ ext {
     def versionPatch = 0
     versionName = "${versionMajor}.${versionMinor}.${versionPatch}"
 
-    compileSdkVersion = 23
-    buildToolsVersion = '23.0.2'
+    compileSdkVersion = 27
+    buildToolsVersion = '27.0.3'
     minSdkVersion = 15
     targetSdkVersion = compileSdkVersion
 
@@ -45,4 +48,4 @@ ext {
     rxAndroidVersion = '1.0.1'
     spockCoreVersion = '1.0-groovy-2.4'
     cglibVersion = '2.2'
-}
+}
diff --git a/examples/counter/build.gradle b/examples/counter/build.gradle
@@ -1,6 +1,4 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.neenbedankt.android-apt'
-apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileSdkVersion project.compileSdkVersion
@@ -35,7 +33,7 @@ dependencies {
     compile "io.reactivex:rxjava:${project.rxJavaVersion}"
     compile "io.reactivex:rxandroid:${project.rxAndroidVersion}"
     compile project(':droidux')
-    apt project(':droidux-processor')
+    annotationProcessor project(':droidux-processor')
     compile project(':middlewares:droidux-thunk')
     compile "com.android.support:appcompat-v7:${project.supportLibrariesVersion}"
     compile "com.android.support:design:${project.supportLibrariesVersion}"

diff --git a/examples/todomvc/build.gradle b/examples/todomvc/build.gradle
@@ -1,6 +1,4 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.neenbedankt.android-apt'
-apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileSdkVersion project.compileSdkVersion
@@ -37,7 +35,7 @@ dependencies {
     compile "io.reactivex:rxjava:${project.rxJavaVersion}"
     compile "io.reactivex:rxandroid:${project.rxAndroidVersion}"
     compile project(':droidux')
-    apt project(':droidux-processor')
+    annotationProcessor project(':droidux-processor')
     compile "com.android.support:appcompat-v7:${project.supportLibrariesVersion}"
     compile "com.android.support:design:${project.supportLibrariesVersion}"
     compile 'com.google.code.gson:gson:2.4'

diff --git a/examples/todos-with-dagger/build.gradle b/examples/todos-with-dagger/build.gradle
@@ -1,6 +1,4 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.neenbedankt.android-apt'
-apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileSdkVersion project.compileSdkVersion
@@ -42,12 +40,12 @@ dependencies {
     compile "io.reactivex:rxjava:${project.rxJavaVersion}"
     compile "io.reactivex:rxandroid:${project.rxAndroidVersion}"
     compile project(':droidux')
-    apt project(':droidux-processor')
+    annotationProcessor project(':droidux-processor')
     compile "com.android.support:appcompat-v7:${project.supportLibrariesVersion}"
     compile "com.android.support:design:${project.supportLibrariesVersion}"
     compile 'com.google.code.gson:gson:2.4'
     compile 'com.google.dagger:dagger:2.0'
-    apt 'com.google.dagger:dagger-compiler:2.0'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.0'
 
     androidTestCompile 'com.android.support.test:runner:0.4.1'
     androidTestCompile 'com.android.support.test:rules:0.4.1'

diff --git a/examples/todos-with-undo/build.gradle b/examples/todos-with-undo/build.gradle
@@ -1,6 +1,4 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.neenbedankt.android-apt'
-apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileSdkVersion project.compileSdkVersion
@@ -37,7 +35,7 @@ dependencies {
     compile "io.reactivex:rxjava:${project.rxJavaVersion}"
     compile "io.reactivex:rxandroid:${project.rxAndroidVersion}"
     compile project(':droidux')
-    apt project(':droidux-processor')
+    annotationProcessor project(':droidux-processor')
     compile "com.android.support:appcompat-v7:${project.supportLibrariesVersion}"
     compile "com.android.support:design:${project.supportLibrariesVersion}"
     compile 'com.google.code.gson:gson:2.4'

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Nov 02 02:18:23 JST 2015
+#Mon Jan 01 18:04:23 JST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip