From 37be76611a3c2134e49175f8923234975d96886b Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Fri, 8 Apr 2022 20:10:50 +0100 Subject: [PATCH 1/8] Version bump of kotlin, okio. --- build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index acaa2e3650b5..8b283e948455 100644 --- a/build.gradle +++ b/build.gradle @@ -7,17 +7,17 @@ buildscript { 'bouncycastle': '1.65', 'brotli': '0.1.2', 'checkstyle': '8.28', - 'conscrypt': '2.5.1', + 'conscrypt': '2.5.2', 'corretto': '1.3.1', 'findbugs': '3.0.2', - 'guava': '28.2-jre', + 'guava': '31.1-jre', 'java': '1.8', 'jnrUnixsocket': '0.28', 'jsoup': '1.13.1', 'junit': '4.13', - 'kotlin': '1.4.10', + 'kotlin': '1.6.20', 'moshi': '1.9.2', - 'okio': '2.8.0', + 'okio': '3.0.0', 'ktlint': '0.38.0', 'picocli': '4.2.0', 'openjsse': '1.1.0' @@ -47,7 +47,7 @@ buildscript { ] dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20" classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.10.1" classpath "com.android.tools.build:gradle:4.0.1" } From e89e7fe98b7601593f9773d4028e7c72192ac16d Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Fri, 8 Apr 2022 20:18:15 +0100 Subject: [PATCH 2/8] Version bump of kotlin, okio. --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 186b71557c50..ffed3a254e91 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 78fa8f1890822c673b1122f3e46bc37a832acbfe Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 9 Apr 2022 10:30:13 +0100 Subject: [PATCH 3/8] Fix repositories --- android-test/build.gradle | 9 +++------ build.gradle | 7 ++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/android-test/build.gradle b/android-test/build.gradle index 21b7b171c899..918790a6fbf4 100644 --- a/android-test/build.gradle +++ b/android-test/build.gradle @@ -2,12 +2,9 @@ apply plugin: 'com.android.library' apply plugin: 'org.jetbrains.kotlin.android' repositories { - jcenter { - // Required for a dependency of Android lint. - content { - includeGroup 'org.jetbrains.trove4j' - } - } + mavenCentral() + gradlePluginPortal() + google() } android { diff --git a/build.gradle b/build.gradle index 8b283e948455..edac9697f839 100644 --- a/build.gradle +++ b/build.gradle @@ -47,9 +47,9 @@ buildscript { ] dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10" classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.10.1" - classpath "com.android.tools.build:gradle:4.0.1" + classpath "com.android.tools.build:gradle:4.0.2" } repositories { @@ -93,9 +93,6 @@ allprojects { repositories { mavenCentral() - maven { - url 'https://dl.bintray.com/kotlin/dokka' - } google() } From edf481c3314d7a33a17bf144d654c0d15f3ab032 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 9 Apr 2022 10:37:11 +0100 Subject: [PATCH 4/8] Fix build --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index edac9697f839..4fc1245ddc25 100644 --- a/build.gradle +++ b/build.gradle @@ -154,6 +154,7 @@ subprojects { project -> tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { kotlinOptions { jvmTarget = "1.8" + freeCompilerArgs += "-Xjvm-default=compatibility" } } From 6601f11e60072908e71b720542757c5b8fc5477d Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 9 Apr 2022 18:31:54 +0100 Subject: [PATCH 5/8] fix build --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 4fc1245ddc25..b0b9f10ff058 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ buildscript { ext.deps = [ 'picocli': "info.picocli:picocli:${versions.picocli}", - 'android': "org.robolectric:android-all:10-robolectric-5803371", + 'android': "org.robolectric:android-all:12.1-robolectric-8229987", 'animalSniffer': "org.codehaus.mojo:animal-sniffer-annotations:${versions.animalSniffer}", 'assertj': "org.assertj:assertj-core:${versions.assertj}", 'bouncycastle': "org.bouncycastle:bcprov-jdk15on:${versions.bouncycastle}", @@ -49,7 +49,7 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10" classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.10.1" - classpath "com.android.tools.build:gradle:4.0.2" + classpath "com.android.tools.build:gradle:7.1.3" } repositories { From 0296827d23e4128a9fad349b1c05ecf16b874924 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 9 Apr 2022 18:51:54 +0100 Subject: [PATCH 6/8] fix build --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b0b9f10ff058..87d164f815ee 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10" classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.10.1" - classpath "com.android.tools.build:gradle:7.1.3" + classpath "com.android.tools.build:gradle:7.0.4" } repositories { From 13e5d8c32427a5945adce5bb260939a904a6a97f Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 9 Apr 2022 19:04:03 +0100 Subject: [PATCH 7/8] fix build --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 87d164f815ee..69d3a88b6550 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { 'jsoup': '1.13.1', 'junit': '4.13', 'kotlin': '1.6.20', - 'moshi': '1.9.2', + 'moshi': '1.13.0', 'okio': '3.0.0', 'ktlint': '0.38.0', 'picocli': '4.2.0', From 503e56ea8f1451e0ee7d5802940673fd3cecf488 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 9 Apr 2022 19:10:17 +0100 Subject: [PATCH 8/8] fix ci jdk for android tests --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8e90c7b4d9e5..5492e288ec5e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -302,6 +302,12 @@ jobs: - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@v1 + - name: Configure JDK + uses: actions/setup-java@v3 + with: + distribution: 'zulu' + java-version: 11 + - name: Run Tests uses: reactivecircus/android-emulator-runner@v2 with: