diff --git a/.travis.yml b/.travis.yml index afdeb5215e..51a6c391e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ android: - tools # https://github.com/travis-ci/travis-ci/issues/6059 - platform-tools - android-25 - - build-tools-25.0.2 + - build-tools-26.0.0 before_script: - export TERM=dumb diff --git a/examples/gradle/build.gradle b/examples/gradle/build.gradle index 9d841e4aa2..ebc963bb26 100644 --- a/examples/gradle/build.gradle +++ b/examples/gradle/build.gradle @@ -1,16 +1,16 @@ buildscript { repositories { - mavenCentral() + jcenter() } dependencies { // replace with the current version of the Android plugin - classpath "com.android.tools.build:gradle:2.3.0" + classpath "com.android.tools.build:gradle:2.3.3" } } repositories { - mavenCentral() mavenLocal() + mavenCentral() } apply plugin: "com.android.application" @@ -23,7 +23,7 @@ dependencies { android { compileSdkVersion 25 - buildToolsVersion "25.0.2" + buildToolsVersion "26.0.0" defaultConfig { minSdkVersion 9 @@ -32,7 +32,7 @@ android { // If you have different applicationIds for buildTypes or productFlavors uncomment this block. //javaCompileOptions { // annotationProcessorOptions { - // arguments = ['resourcePackageName': android.defaultConfig.applicationId] + // arguments = ['resourcePackageName': "org.androidannotations.sample"] // } //} } diff --git a/examples/gradle/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/gradle/wrapper/gradle-wrapper.properties index 071a4ff67c..82c4cdcd79 100644 --- a/examples/gradle/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-all.zip diff --git a/examples/kotlin/build.gradle b/examples/kotlin/build.gradle index 125c2caaaa..3a26b9971f 100644 --- a/examples/kotlin/build.gradle +++ b/examples/kotlin/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = "1.1.0" + ext.kotlin_version = "1.1.3-2" repositories { jcenter() @@ -22,7 +22,7 @@ apply plugin: "kotlin-kapt" android { compileSdkVersion 25 - buildToolsVersion "25.0.2" + buildToolsVersion "26.0.0" defaultConfig { minSdkVersion 9 @@ -33,11 +33,12 @@ android { } } -kapt { - arguments { - arg("androidManifestFile", variant.outputs[0].processResourcesTask.manifestFile) - } -} +// If you have different applicationIds for buildTypes or productFlavors uncomment this block. +//kapt { +// arguments { +// arg("resourcePackageName", "org.androidannotations.gradle") +// } +//} def AAVersion = "4.4.0-SNAPSHOT" // change this to your desired version, for example the latest stable: 4.3.1 diff --git a/examples/kotlin/gradle/wrapper/gradle-wrapper.properties b/examples/kotlin/gradle/wrapper/gradle-wrapper.properties index 031d6c599f..1e6c29f114 100644 --- a/examples/kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/examples/kotlin/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-all.zip