From eef3c3fb0ddeb629eae1a41863922bbd25961ab2 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 16 Aug 2022 16:17:42 -0300 Subject: [PATCH] Upgrade to Android Studio Chipmunk and upgrade other dependencies as well --- build.gradle | 6 +- gradle/verification-keyring.gpg | Bin 309426 -> 316618 bytes gradle/verification-metadata.xml | 1298 +++++++++++++++++ libs/database/build.gradle | 11 +- libs/download/build.gradle | 19 +- .../org/fdroid/download/HttpDownloader.kt | 1 + libs/index/build.gradle | 10 +- libs/sharedTest/build.gradle | 2 +- 8 files changed, 1324 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index 63e5c07bb..13ad8a7e1 100644 --- a/build.gradle +++ b/build.gradle @@ -4,9 +4,9 @@ buildscript { maven { url 'https://maven.google.com/' } } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21" - classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.6.21" + classpath 'com.android.tools.build:gradle:7.2.2' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20" + classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.20" classpath 'com.vanniktech:gradle-maven-publish-plugin:0.18.0' } } diff --git a/gradle/verification-keyring.gpg b/gradle/verification-keyring.gpg index 640f023e2965b2b1719b918a551f35736fa44d42..850663e1b489c78b224de4218b57362888db8338 100644 GIT binary patch delta 7113 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 delta 17 ZcmX@LQh3uxp@tU57N!>FEi9XM002h!2XFuY diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index f4f4d9750..edbd0b6a3 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -512,6 +512,11 @@ + + + + + @@ -530,6 +535,11 @@ + + + + + @@ -675,6 +685,11 @@ + + + + + @@ -698,6 +713,11 @@ + + + + + @@ -721,6 +741,11 @@ + + + + + @@ -736,6 +761,11 @@ + + + + + @@ -746,6 +776,11 @@ + + + + + @@ -899,26 +934,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -934,6 +994,11 @@ + + + + + @@ -1366,6 +1431,11 @@ + + + + + @@ -1384,6 +1454,11 @@ + + + + + @@ -1402,6 +1477,11 @@ + + + + + @@ -1420,6 +1500,11 @@ + + + + + @@ -1438,6 +1523,11 @@ + + + + + @@ -1456,6 +1546,11 @@ + + + + + @@ -1474,6 +1569,11 @@ + + + + + @@ -1492,6 +1592,11 @@ + + + + + @@ -1510,6 +1615,11 @@ + + + + + @@ -1528,6 +1638,11 @@ + + + + + @@ -1546,6 +1661,11 @@ + + + + + @@ -1564,6 +1684,11 @@ + + + + + @@ -1582,6 +1707,11 @@ + + + + + @@ -1601,6 +1731,11 @@ + + + + + @@ -1629,6 +1764,11 @@ + + + + + @@ -1639,6 +1779,11 @@ + + + + + @@ -1657,6 +1802,11 @@ + + + + + @@ -1675,6 +1825,11 @@ + + + + + @@ -1693,6 +1848,11 @@ + + + + + @@ -1711,6 +1871,11 @@ + + + + + @@ -1729,6 +1894,11 @@ + + + + + @@ -1747,6 +1917,11 @@ + + + + + @@ -1765,6 +1940,11 @@ + + + + + @@ -1783,6 +1963,11 @@ + + + + + @@ -1801,6 +1986,11 @@ + + + + + @@ -1854,11 +2044,21 @@ + + + + + + + + + + @@ -1877,6 +2077,11 @@ + + + + + @@ -1895,6 +2100,11 @@ + + + + + @@ -1913,6 +2123,11 @@ + + + + + @@ -1931,6 +2146,11 @@ + + + + + @@ -1949,6 +2169,11 @@ + + + + + @@ -1967,6 +2192,11 @@ + + + + + @@ -1985,6 +2215,11 @@ + + + + + @@ -2003,6 +2238,11 @@ + + + + + @@ -2026,81 +2266,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2168,6 +2493,11 @@ + + + + + @@ -2186,6 +2516,11 @@ + + + + + @@ -2204,6 +2539,11 @@ + + + + + @@ -2214,6 +2554,11 @@ + + + + + @@ -2224,6 +2569,11 @@ + + + + + @@ -2234,6 +2584,11 @@ + + + + + @@ -2547,6 +2902,12 @@ + + + + + + @@ -3068,6 +3429,12 @@ + + + + + + @@ -3272,6 +3639,11 @@ + + + + + @@ -3465,6 +3837,17 @@ + + + + + + + + + + + @@ -3512,6 +3895,17 @@ + + + + + + + + + + + @@ -3537,6 +3931,17 @@ + + + + + + + + + + + @@ -3577,6 +3982,17 @@ + + + + + + + + + + + @@ -3621,6 +4037,21 @@ + + + + + + + + + + + + + + + @@ -3641,6 +4072,17 @@ + + + + + + + + + + + @@ -3651,6 +4093,12 @@ + + + + + + @@ -3676,6 +4124,17 @@ + + + + + + + + + + + @@ -3692,6 +4151,17 @@ + + + + + + + + + + + @@ -3713,6 +4183,17 @@ + + + + + + + + + + + @@ -3728,6 +4209,17 @@ + + + + + + + + + + + @@ -3770,6 +4262,17 @@ + + + + + + + + + + + @@ -3801,6 +4304,17 @@ + + + + + + + + + + + @@ -3831,6 +4345,12 @@ + + + + + + @@ -3856,6 +4376,17 @@ + + + + + + + + + + + @@ -3908,6 +4439,17 @@ + + + + + + + + + + + @@ -3933,6 +4475,17 @@ + + + + + + + + + + + @@ -3985,6 +4538,17 @@ + + + + + + + + + + + @@ -4025,6 +4589,17 @@ + + + + + + + + + + + @@ -4056,6 +4631,17 @@ + + + + + + + + + + + @@ -4071,6 +4657,17 @@ + + + + + + + + + + + @@ -4113,6 +4710,17 @@ + + + + + + + + + + + @@ -4138,6 +4746,17 @@ + + + + + + + + + + + @@ -4180,6 +4799,17 @@ + + + + + + + + + + + @@ -4195,6 +4825,17 @@ + + + + + + + + + + + @@ -4221,6 +4862,17 @@ + + + + + + + + + + + @@ -4236,6 +4888,17 @@ + + + + + + + + + + + @@ -4876,6 +5539,11 @@ + + + + + @@ -4899,6 +5567,11 @@ + + + + + @@ -5173,6 +5846,12 @@ + + + + + + @@ -5464,21 +6143,41 @@ + + + + + + + + + + + + + + + + + + + + @@ -5509,16 +6208,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5530,41 +6255,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5591,6 +6396,16 @@ + + + + + + + + + + @@ -5606,6 +6421,16 @@ + + + + + + + + + + @@ -5621,6 +6446,16 @@ + + + + + + + + + + @@ -5641,6 +6476,16 @@ + + + + + + + + + + @@ -5656,6 +6501,16 @@ + + + + + + + + + + @@ -5671,6 +6526,16 @@ + + + + + + + + + + @@ -5691,6 +6556,16 @@ + + + + + + + + + + @@ -5706,6 +6581,16 @@ + + + + + + + + + + @@ -5721,6 +6606,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5736,6 +6657,16 @@ + + + + + + + + + + @@ -5751,6 +6682,16 @@ + + + + + + + + + + @@ -5766,6 +6707,16 @@ + + + + + + + + + + @@ -5781,6 +6732,21 @@ + + + + + + + + + + + + + + + @@ -5796,6 +6762,21 @@ + + + + + + + + + + + + + + + @@ -5836,6 +6817,21 @@ + + + + + + + + + + + + + + + @@ -5856,6 +6852,16 @@ + + + + + + + + + + @@ -5871,6 +6877,16 @@ + + + + + + + + + + @@ -5886,6 +6902,16 @@ + + + + + + + + + + @@ -5901,6 +6927,16 @@ + + + + + + + + + + @@ -5916,6 +6952,16 @@ + + + + + + + + + + @@ -5926,6 +6972,21 @@ + + + + + + + + + + + + + + + @@ -5976,6 +7037,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -6021,6 +7102,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -6066,6 +7167,21 @@ + + + + + + + + + + + + + + + @@ -6111,6 +7227,21 @@ + + + + + + + + + + + + + + + @@ -6126,6 +7257,16 @@ + + + + + + + + + + @@ -6141,6 +7282,16 @@ + + + + + + + + + + @@ -6156,6 +7307,16 @@ + + + + + + + + + + @@ -6171,6 +7332,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6186,6 +7372,11 @@ + + + + + @@ -6201,6 +7392,21 @@ + + + + + + + + + + + + + + + @@ -6216,6 +7422,16 @@ + + + + + + + + + + @@ -6280,6 +7496,11 @@ + + + + + @@ -6321,6 +7542,11 @@ + + + + + @@ -6347,6 +7573,16 @@ + + + + + + + + + + @@ -6367,6 +7603,11 @@ + + + + + @@ -6377,6 +7618,11 @@ + + + + + @@ -6401,11 +7647,22 @@ + + + + + + + + + + + @@ -6419,6 +7676,16 @@ + + + + + + + + + + @@ -6434,6 +7701,16 @@ + + + + + + + + + + @@ -6457,6 +7734,16 @@ + + + + + + + + + + @@ -6472,6 +7759,16 @@ + + + + + + + + + + @@ -6523,6 +7820,7 @@ + diff --git a/libs/database/build.gradle b/libs/database/build.gradle index 8e5f855e8..baf55aefd 100644 --- a/libs/database/build.gradle +++ b/libs/database/build.gradle @@ -65,17 +65,16 @@ dependencies { implementation project(":libs:index") implementation 'androidx.core:core-ktx:1.8.0' - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.0' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1' - def room_version = "2.4.2" - implementation "androidx.room:room-runtime:$room_version" - implementation "androidx.room:room-ktx:$room_version" - kapt "androidx.room:room-compiler:$room_version" + implementation "androidx.room:room-runtime:2.4.3" + implementation "androidx.room:room-ktx:2.4.3" + kapt "androidx.room:room-compiler:2.4.3" implementation 'io.github.microutils:kotlin-logging:2.1.21' implementation "org.slf4j:slf4j-android:1.7.36" - implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3" + implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1" testImplementation project(":libs:sharedTest") testImplementation 'junit:junit:4.13.2' diff --git a/libs/download/build.gradle b/libs/download/build.gradle index db26c9cea..894774deb 100644 --- a/libs/download/build.gradle +++ b/libs/download/build.gradle @@ -24,10 +24,6 @@ kotlin { // else if (isMingwX64) nativeTarget = mingwX64("native") // else throw new GradleException("Host OS is not supported in Kotlin/Native.") - ext { - ktor_version = "2.0.3" - } - sourceSets { all { languageSettings { @@ -37,20 +33,20 @@ kotlin { } commonMain { dependencies { - api "io.ktor:ktor-client-core:$ktor_version" + api "io.ktor:ktor-client-core:2.1.3" implementation 'io.github.microutils:kotlin-logging:2.1.21' } } commonTest { dependencies { implementation kotlin('test') - implementation "io.ktor:ktor-client-mock:$ktor_version" + implementation "io.ktor:ktor-client-mock:2.1.3" } } // JVM is disabled for now, because Android app is including it instead of Android library jvmMain { dependencies { - implementation "io.ktor:ktor-client-cio:$ktor_version" + implementation "io.ktor:ktor-client-cio:2.1.3" } } jvmTest { @@ -59,8 +55,10 @@ kotlin { } } androidMain { + // needed because of https://issuetracker.google.com/issues/231701341 + kotlin.srcDir("src/commonMain/kotlin") dependencies { - implementation "io.ktor:ktor-client-okhttp:$ktor_version" + implementation "io.ktor:ktor-client-okhttp:2.1.3" implementation("com.github.bumptech.glide:glide:4.12.0") { transitive = false // we don't need all that it pulls in, just the basics } @@ -68,7 +66,10 @@ kotlin { } } androidTest { + // needed because of https://issuetracker.google.com/issues/231701341 + kotlin.srcDir("src/commonTest/kotlin") dependencies { + implementation kotlin('test') implementation 'org.json:json:20220320' implementation 'junit:junit:4.13.2' implementation 'ch.qos.logback:logback-classic:1.2.11' @@ -82,7 +83,7 @@ kotlin { } nativeMain { dependencies { - implementation "io.ktor:ktor-client-curl:$ktor_version" + implementation "io.ktor:ktor-client-curl:2.1.3" } } nativeTest { diff --git a/libs/download/src/androidMain/kotlin/org/fdroid/download/HttpDownloader.kt b/libs/download/src/androidMain/kotlin/org/fdroid/download/HttpDownloader.kt index bfcaef7e0..5858a7963 100644 --- a/libs/download/src/androidMain/kotlin/org/fdroid/download/HttpDownloader.kt +++ b/libs/download/src/androidMain/kotlin/org/fdroid/download/HttpDownloader.kt @@ -104,6 +104,7 @@ public class HttpDownloader constructor( * @see [Cookieless cookies](http://lucb1e.com/rp/cookielesscookies) */ @Suppress("DEPRECATION") + @Deprecated("Use only for v1 repos") @Throws(IOException::class, InterruptedException::class) public override fun download() { val headInfo = runBlocking { diff --git a/libs/index/build.gradle b/libs/index/build.gradle index fc3cb5bc1..84b0e8cc6 100644 --- a/libs/index/build.gradle +++ b/libs/index/build.gradle @@ -1,6 +1,6 @@ plugins { id 'org.jetbrains.kotlin.multiplatform' - id 'org.jetbrains.kotlin.plugin.serialization' version '1.6.21' + id 'org.jetbrains.kotlin.plugin.serialization' version '1.7.21' id 'com.android.library' id 'org.jetbrains.dokka' id "org.jlleitschuh.gradle.ktlint" version "10.2.1" @@ -36,11 +36,11 @@ kotlin { } commonMain { dependencies { - implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3" + implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1" implementation 'io.github.microutils:kotlin-logging:2.1.21' implementation project(":libs:download") - implementation "io.ktor:ktor-io:2.0.3" + implementation "io.ktor:ktor-io:2.1.3" } } commonTest { @@ -61,8 +61,10 @@ kotlin { } } androidMain { + // needed because of https://issuetracker.google.com/issues/231701341 + kotlin.srcDir("src/commonMain/kotlin") dependencies { - implementation "org.jetbrains.kotlin:kotlin-reflect:1.6.21" + implementation "org.jetbrains.kotlin:kotlin-reflect:1.7.21" implementation 'androidx.core:core-ktx:1.8.0' implementation "org.slf4j:slf4j-android:1.7.36" } diff --git a/libs/sharedTest/build.gradle b/libs/sharedTest/build.gradle index 1b4cf86f8..15007c2c8 100644 --- a/libs/sharedTest/build.gradle +++ b/libs/sharedTest/build.gradle @@ -21,7 +21,7 @@ dependencies { implementation project(":libs:index") implementation 'org.jetbrains.kotlin:kotlin-test' - implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3" + implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1" } apply from: "${rootProject.rootDir}/gradle/ktlint.gradle"