From 2c7d0ddf59d855bbce73af8d623d5755ba0d4a7f Mon Sep 17 00:00:00 2001 From: Mirek Stanek Date: Wed, 20 Feb 2019 21:07:01 +0100 Subject: [PATCH 1/9] updates dependencies for Android 3.3 --- build.gradle | 4 ++-- buildsystem/dependencies.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 11657d2..e7d5406 100644 --- a/build.gradle +++ b/build.gradle @@ -6,9 +6,9 @@ buildscript { maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.3.1' classpath 'org.jacoco:org.jacoco.core:0.8.1' - classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-rc1' + classpath 'com.jakewharton:butterknife-gradle-plugin:10.1.0' } } diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle index 72bf0df..5c11ef1 100644 --- a/buildsystem/dependencies.gradle +++ b/buildsystem/dependencies.gradle @@ -6,7 +6,7 @@ ext { //Annotation processor dependencies daggerVersion = '2.14.1' autoFactoryVersion = '1.0-beta3' - butterknifeVersion = '9.0.0-rc1' + butterknifeVersion = '10.1.0' //Standard dependencies supportLibraryVersion = '1.0.0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2492a66..b552063 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jul 03 19:11:48 CEST 2018 +#Wed Feb 20 21:04:10 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip From 478ff3bde3c21b6a96329a398eb96cfd662baceb Mon Sep 17 00:00:00 2001 From: Mirek Stanek Date: Thu, 18 Apr 2019 12:51:18 +0200 Subject: [PATCH 2/9] update to gradle plugin 3.5.0-alpha11 (gradle should work now - R.txt is generated correctly). --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index e7d5406..835cf3f 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:3.5.0-alpha11' classpath 'org.jacoco:org.jacoco.core:0.8.1' classpath 'com.jakewharton:butterknife-gradle-plugin:10.1.0' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b552063..892337c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Feb 20 21:04:10 CET 2019 +#Thu Apr 18 10:22:09 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip From 266cfc37fc43d946da2aac423b91bed13fbe0229 Mon Sep 17 00:00:00 2001 From: Miroslaw Stanek Date: Tue, 23 Apr 2019 14:07:32 +0200 Subject: [PATCH 3/9] Gradle 3.5.0 alpha 12 with R.txt problem solved --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 835cf3f..423a48e 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0-alpha11' + classpath 'com.android.tools.build:gradle:3.5.0-alpha12' classpath 'org.jacoco:org.jacoco.core:0.8.1' classpath 'com.jakewharton:butterknife-gradle-plugin:10.1.0' } From d1a1429628db9bf40afe51f8843503981110041c Mon Sep 17 00:00:00 2001 From: Miroslaw Stanek Date: Fri, 18 Oct 2019 11:58:00 +0200 Subject: [PATCH 4/9] update gradle plugin --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 423a48e..a020175 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0-alpha12' + classpath 'com.android.tools.build:gradle:3.5.1' classpath 'org.jacoco:org.jacoco.core:0.8.1' classpath 'com.jakewharton:butterknife-gradle-plugin:10.1.0' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 892337c..96b485e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Apr 18 10:22:09 CEST 2019 +#Fri Oct 18 11:44:19 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip From 200190ba5f214a9e3cdcb319fd85112ba5ccbf3a Mon Sep 17 00:00:00 2001 From: Miroslaw Stanek Date: Fri, 18 Oct 2019 11:58:45 +0200 Subject: [PATCH 5/9] updated Android SDK to API 29 --- buildsystem/android_commons.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildsystem/android_commons.gradle b/buildsystem/android_commons.gradle index 15e3072..2f2c466 100644 --- a/buildsystem/android_commons.gradle +++ b/buildsystem/android_commons.gradle @@ -1,8 +1,8 @@ android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { minSdkVersion 23 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 1 versionName "1.0" } From b17b4e6b702fac3baac5f69e3641d17bf85c56e2 Mon Sep 17 00:00:00 2001 From: Miroslaw Stanek Date: Fri, 18 Oct 2019 12:04:40 +0200 Subject: [PATCH 6/9] update travis config --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0ef0fd9..2e3839c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ language: android android: components: - - build-tools-28.0.3 - - android-28 + - build-tools-29.0.2 + - android-29 - extra-google-m2repository - extra-android-m2repository From d34d3839590bb32d282000ecab6aae0d4242f3b5 Mon Sep 17 00:00:00 2001 From: Miroslaw Stanek Date: Fri, 18 Oct 2019 12:16:08 +0200 Subject: [PATCH 7/9] accept licence by travis --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2e3839c..930ea78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,9 @@ android: jdk: - oraclejdk8 +before_install: + - yes | sdkmanager --licenses + notifications: email: true From b7a0f8f6511316324837f63145f47821b65e6dae Mon Sep 17 00:00:00 2001 From: Miroslaw Stanek Date: Fri, 18 Oct 2019 12:27:21 +0200 Subject: [PATCH 8/9] keep updating travis --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 930ea78..e3bbcf7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,12 +7,16 @@ android: - extra-google-m2repository - extra-android-m2repository + licenses: + - 'android-sdk-preview-license-52d11cd2' + - 'android-sdk-license-.+' + - 'google-gdk-license-.+' jdk: - oraclejdk8 before_install: - - yes | sdkmanager --licenses + - yes | sdkmanager "build-tools;29.0.2" notifications: email: true @@ -22,4 +26,4 @@ cache: - $HOME/.m2 script: - ./gradlew testDebugUnitTest testDebugUnitTestCoverage assembleDebug + ./gradlew testDebugUnitTest testDebugUnitTestCoverage assembleDebug From a5355ec5cc52abfab0d2671bb343b81403e44186 Mon Sep 17 00:00:00 2001 From: Miroslaw Stanek Date: Fri, 18 Oct 2019 12:35:00 +0200 Subject: [PATCH 9/9] Travis config update --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e3bbcf7..51e038a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: android android: components: - - build-tools-29.0.2 + - build-tools-28.0.3 - android-29 - extra-google-m2repository @@ -16,7 +16,7 @@ jdk: - oraclejdk8 before_install: - - yes | sdkmanager "build-tools;29.0.2" + - yes | sdkmanager "build-tools;28.0.3" notifications: email: true