From c83835f34e57ccecd08a1fec6a33cf8306e135ec Mon Sep 17 00:00:00 2001 From: Alok Date: Thu, 1 Nov 2018 13:52:30 +0530 Subject: [PATCH 1/7] API 28 updates --- build.gradle | 8 ++++---- enabler/src/main/AndroidManifest.xml | 1 + gradle/wrapper/gradle-wrapper.properties | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 19f781ec3..12a48d9af 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2' classpath 'com.github.triplet.gradle:play-publisher:1.2.0' @@ -25,10 +25,10 @@ allprojects { ext { - compileSdkVersion = 27 - buildToolsVersion = "27.0.3" + compileSdkVersion = 28 + buildToolsVersion = "28.0.3" minSdkVersion = 18 - targetSdkVersion = 27 + targetSdkVersion = 28 versionMajor = 7 versionMinor = 0 diff --git a/enabler/src/main/AndroidManifest.xml b/enabler/src/main/AndroidManifest.xml index cdb57fbca..3d847ee7f 100644 --- a/enabler/src/main/AndroidManifest.xml +++ b/enabler/src/main/AndroidManifest.xml @@ -12,6 +12,7 @@ + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2c3d80e2..cecf7e4e3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Thu Oct 11 12:58:01 IST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME +org.gradle.jvmargs=-Xmx1536M zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip -org.gradle.jvmargs=-Xmx1536M \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip From 80c55013711be46382f19199191636e9ba2dfc7a Mon Sep 17 00:00:00 2001 From: Alok Date: Thu, 1 Nov 2018 15:29:49 +0530 Subject: [PATCH 2/7] Updated travis file for new android version --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e2df93af..13b40b529 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,8 @@ android: components: - platform-tools - tools - - build-tools-27.0.3 - - android-27 + - build-tools-28.0.3 + - android-28 - extra-android-support - extra-android-m2repository script: From d2f5dda82e18eabab2f5311c475cc613d510f8c8 Mon Sep 17 00:00:00 2001 From: Alok Date: Wed, 16 Jan 2019 14:06:49 +0530 Subject: [PATCH 3/7] Updating to gradle plugin 4.10+ Updated plugins --- build.gradle | 6 +++--- enabler/build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 6 +++--- library/build.gradle | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 12a48d9af..edcd0c39e 100644 --- a/build.gradle +++ b/build.gradle @@ -8,11 +8,11 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7' classpath 'com.github.triplet.gradle:play-publisher:1.2.0' - classpath 'com.bugsnag:bugsnag-android-gradle-plugin:3.2.5' + classpath 'com.bugsnag:bugsnag-android-gradle-plugin:3.5.0' } } diff --git a/enabler/build.gradle b/enabler/build.gradle index 11a5f2e4e..e9ad13c93 100644 --- a/enabler/build.gradle +++ b/enabler/build.gradle @@ -78,14 +78,14 @@ android { dependencies { implementation project(":library") - implementation 'com.android.support:support-v4:27.1.1' + implementation 'com.android.support:support-v4:28.0.0' implementation 'com.bugsnag:bugsnag-android:4.3.2' implementation 'net.hockeyapp.android:HockeySDK:5.1.0' androidTestImplementation 'junit:junit:4.12' androidTestImplementation 'org.hamcrest:hamcrest-library:1.3' - androidTestImplementation 'org.mockito:mockito-core:2.17.0' + androidTestImplementation 'org.mockito:mockito-core:2.23.0' androidTestImplementation 'com.google.dexmaker:dexmaker:1.2' androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cecf7e4e3..1cc6b5951 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Thu Oct 11 12:58:01 IST 2018 +#Wed Jan 16 13:29:14 IST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME -org.gradle.jvmargs=-Xmx1536M zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +org.gradle.jvmargs=-Xmx1536M +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index 2afec75bc..0319b54bd 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -22,15 +22,15 @@ android { apply plugin: 'com.github.dcendents.android-maven' dependencies { - api 'com.google.code.gson:gson:2.8.2' + api 'com.google.code.gson:gson:2.8.5' implementation 'com.google.guava:guava:24.1-android' implementation 'com.google.protobuf:protobuf-java:3.5.1' implementation 'commons-io:commons-io:2.6' - implementation 'com.android.support:support-v4:27.1.1' + implementation 'com.android.support:support-v4:28.0.0' testImplementation 'junit:junit:4.12' testImplementation 'org.hamcrest:hamcrest-all:1.3' - testImplementation 'org.mockito:mockito-core:2.17.0' + testImplementation 'org.mockito:mockito-core:2.23.0' testImplementation 'org.robolectric:robolectric:3.8' testImplementation 'org.robolectric:shadows-httpclient:3.8' } From 1e5b1d59c87cc1fe55a0f4f98eccaefce7d196cd Mon Sep 17 00:00:00 2001 From: Alok Date: Fri, 1 Feb 2019 14:00:40 +0530 Subject: [PATCH 4/7] guava to api from implementation --- library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index 0319b54bd..1de6a9473 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -23,7 +23,7 @@ apply plugin: 'com.github.dcendents.android-maven' dependencies { api 'com.google.code.gson:gson:2.8.5' - implementation 'com.google.guava:guava:24.1-android' + api 'com.google.guava:guava:24.1-android' implementation 'com.google.protobuf:protobuf-java:3.5.1' implementation 'commons-io:commons-io:2.6' implementation 'com.android.support:support-v4:28.0.0' From 5953afaf429c9d954c2303c2cdd0252a6a5995dc Mon Sep 17 00:00:00 2001 From: Alok Date: Fri, 1 Feb 2019 14:47:14 +0530 Subject: [PATCH 5/7] Added legacy http library to manifest --- enabler/src/main/AndroidManifest.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/enabler/src/main/AndroidManifest.xml b/enabler/src/main/AndroidManifest.xml index 3d847ee7f..913fb74ee 100644 --- a/enabler/src/main/AndroidManifest.xml +++ b/enabler/src/main/AndroidManifest.xml @@ -59,6 +59,8 @@ + + From ac161dcda64ba48e6aaf466f62201ebd7528564e Mon Sep 17 00:00:00 2001 From: Alok Date: Fri, 1 Feb 2019 19:04:16 +0530 Subject: [PATCH 6/7] Added before_install to accept license --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 13b40b529..4739276eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,8 @@ android: - android-28 - extra-android-support - extra-android-m2repository +before_install: + - yes | sdkmanager "platforms;android-28" script: - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ./gradlew build test || ./gradlew testDebug' deploy: From 6d5247fba6188d245e125111d86c57c2eba72155 Mon Sep 17 00:00:00 2001 From: Alok Date: Mon, 4 Feb 2019 11:36:08 +0530 Subject: [PATCH 7/7] Updated version to 7.0.4 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index edcd0c39e..8f6090d13 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ ext { versionMajor = 7 versionMinor = 0 - versionPatch = 0 + versionPatch = 4 versionCode = versionMajor * 1000000 + versionMinor * 1000 + versionPatch versionName = "${versionMajor}.${versionMinor}.${versionPatch}"