From 11b895c1d2f23fef597659b9cd499404e170db78 Mon Sep 17 00:00:00 2001 From: Walter Ching Date: Sun, 27 Sep 2020 14:41:47 +0200 Subject: [PATCH 1/9] Update dependencies Update: Kotlin RxJava Gson JUnit MockitoKotlin Remove: Cglib Spock Mockito core --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- library/build.gradle | 16 +++++----------- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 277ddc3..0e351fd 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:4.0.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a82e409..23aa690 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index 912de58..e7c0cc5 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'groovy' apply plugin: 'maven' buildscript { - ext.kotlin_version = '1.3.41' + ext.kotlin_version = '1.4.10' repositories { mavenCentral() @@ -28,20 +28,14 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" // Rx - implementation 'io.reactivex.rxjava2:rxjava:2.2.8' + implementation 'io.reactivex.rxjava2:rxjava:2.2.19' // GSON - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.6' // Testing - testImplementation 'junit:junit:4.12' - testImplementation 'org.mockito:mockito-core:2.27.0' - testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0" - - testImplementation "cglib:cglib:2.2" - testImplementation('org.spockframework:spock-core:1.0-groovy-2.4') { - exclude group: 'junit' - } + testImplementation 'junit:junit:4.13' + testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" } compileKotlin { From 5ea36d2c805b7ad94d06cf3ff42a88f74d00d60c Mon Sep 17 00:00:00 2001 From: Walter Ching Date: Sun, 27 Sep 2020 14:42:51 +0200 Subject: [PATCH 2/9] Update dependencies in sample --- sample/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sample/build.gradle b/sample/build.gradle index 4c9bd51..3ad6844 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -28,8 +28,8 @@ android { dependencies { // Android - implementation 'androidx.appcompat:appcompat:1.0.2' - implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'androidx.cardview:cardview:1.0.0' // Heimdall @@ -37,11 +37,11 @@ dependencies { // Rx implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' - implementation 'io.reactivex.rxjava2:rxjava:2.2.7' + implementation 'io.reactivex.rxjava2:rxjava:2.2.19' implementation 'com.trello.rxlifecycle3:rxlifecycle-components:3.0.0' // Serialization - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.6' implementation 'org.parceler:parceler-api:0.2.16' // Network From f5413758f181629b3cce36bd7018fb3ac1e8cee5 Mon Sep 17 00:00:00 2001 From: Walter Ching Date: Sun, 27 Sep 2020 14:44:21 +0200 Subject: [PATCH 3/9] Update compile, build tools and target sdk in sample --- sample/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sample/build.gradle b/sample/build.gradle index 3ad6844..c5a5f89 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -7,13 +7,13 @@ buildscript { } android { - compileSdkVersion 28 - buildToolsVersion "28.0.3" + compileSdkVersion 30 + buildToolsVersion "30.0.2" defaultConfig { applicationId "de.rheinfabrik.heimdall" minSdkVersion 15 - targetSdkVersion 28 + targetSdkVersion 30 versionCode 1 versionName "1.0" } From bcd2e4472e362ae5128dd19a723d0e753d83b40a Mon Sep 17 00:00:00 2001 From: Walter Ching Date: Sun, 27 Sep 2020 14:45:20 +0200 Subject: [PATCH 4/9] Update travis.yml file --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29d3c5b..228dcd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,8 @@ jdk: oraclejdk8 env: global: - - ANDROID_API_LEVEL=28 - - ANDROID_BUILD_TOOLS_VERSION=28.0.3 + - ANDROID_API_LEVEL=30 + - ANDROID_BUILD_TOOLS_VERSION=30.0.2 - ANDROID_ABI=armeabi-v7a android: @@ -20,8 +20,8 @@ android: before_install: - touch $HOME/.android/repositories.cfg - - yes | sdkmanager "platforms;android-28" - - yes | sdkmanager "build-tools;28.0.3" + - yes | sdkmanager "platforms;android-30" + - yes | sdkmanager "build-tools;30.0.2" before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock From c68ae6be16e1a551a3828f08c6464d6861f535f6 Mon Sep 17 00:00:00 2001 From: Walter Ching Date: Sun, 27 Sep 2020 14:51:27 +0200 Subject: [PATCH 5/9] Update travis.yml file - OpenJDK11 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 228dcd5..13de308 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: android sudo: required -jdk: oraclejdk8 +jdk: openjdk11 env: global: From 68bbda7b95d904197124c615ba4879512face680 Mon Sep 17 00:00:00 2001 From: Walter Ching Date: Sun, 27 Sep 2020 14:54:24 +0200 Subject: [PATCH 6/9] Update travis.yml file - OpenJDK11 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 13de308..316ea83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: android sudo: required -jdk: openjdk11 +jdk: oraclejdk11 env: global: From db39aa03fdd842a66fa1a7774059936773600721 Mon Sep 17 00:00:00 2001 From: Walter Ching Date: Sun, 27 Sep 2020 14:59:20 +0200 Subject: [PATCH 7/9] Bump min sdk in sample to be 21 --- sample/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample/build.gradle b/sample/build.gradle index c5a5f89..77b802b 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -12,7 +12,7 @@ android { defaultConfig { applicationId "de.rheinfabrik.heimdall" - minSdkVersion 15 + minSdkVersion 21 targetSdkVersion 30 versionCode 1 versionName "1.0" From d5b97fdb380279655a515114411642f3ad8d575a Mon Sep 17 00:00:00 2001 From: Walter Ching Date: Sun, 27 Sep 2020 14:59:30 +0200 Subject: [PATCH 8/9] Add mockito inline to the library --- library/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/library/build.gradle b/library/build.gradle index e7c0cc5..bdde9c8 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -36,6 +36,7 @@ dependencies { // Testing testImplementation 'junit:junit:4.13' testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" + testImplementation "org.mockito:mockito-inline:3.5.11" } compileKotlin { From d532f675ef8abfa5f996336973b8cbebad52ed26 Mon Sep 17 00:00:00 2001 From: Walter Ching Date: Sun, 27 Sep 2020 15:06:28 +0200 Subject: [PATCH 9/9] Update travis.yml file back to oraclejdk8 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 316ea83..228dcd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: android sudo: required -jdk: oraclejdk11 +jdk: oraclejdk8 env: global: