opensourcemirror
/
fdroid-client
mirror of https://gitlab.com/fdroid/fdroidclient.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Upgrade to Android Studio Chipmunk 

and upgrade other dependencies as well
This commit is contained in:
Torsten Grote 2022-08-16 16:17:42 -03:00 committed by Hans-Christoph Steiner
parent 83dd06e682
commit eef3c3fb0d
No known key found for this signature in database
GPG Key ID: 3E177817BA1B9BFA
8 changed files with 1324 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -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'
}
}

BIN
gradle/verification-keyring.gpg
View File

Binary file not shown.

1298
gradle/verification-metadata.xml
View File

File diff suppressed because it is too large Load Diff

11
libs/database/build.gradle
View File

@ -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'

19
libs/download/build.gradle
View File

@ -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 {

1
libs/download/src/androidMain/kotlin/org/fdroid/download/HttpDownloader.kt
View File

@ -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 {

10
libs/index/build.gradle
View File

@ -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"
}

2
libs/sharedTest/build.gradle
View File

@ -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"