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

Upgrade all (most of) the things

This commit is contained in:
Torsten Grote 2023-05-24 16:34:53 -03:00
parent 9c50183b68
commit 21f8a23814
No known key found for this signature in database
GPG Key ID: 3E5F77D92CF891FF
11 changed files with 843 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/build.gradle
View File

@ -151,18 +151,18 @@ dependencies {
implementation project(":libs:download")
implementation project(":libs:index")
implementation project(":libs:database")
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.preference:preference:1.2.0'
implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.recyclerview:recyclerview:1.3.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.palette:palette:1.0.0'
implementation 'androidx.work:work-runtime:2.7.1'
implementation 'androidx.work:work-runtime:2.8.1'
implementation 'com.google.guava:guava:31.0-android' // somehow needed for work-runtime to function
implementation 'com.google.android.material:material:1.6.1'
implementation 'com.google.android.material:material:1.9.0'
implementation 'com.google.zxing:core:3.3.3' // newer version need minSdk 24 or library desugering
implementation 'info.guardianproject.netcipher:netcipher:2.2.0-alpha'
@ -177,8 +177,8 @@ dependencies {
implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
implementation 'io.reactivex.rxjava3:rxjava:3.0.9'
implementation "com.github.bumptech.glide:glide:4.12.0"
annotationProcessor "com.github.bumptech.glide:compiler:4.12.0"
implementation "com.github.bumptech.glide:glide:4.14.2"
annotationProcessor "com.github.bumptech.glide:compiler:4.14.2"
implementation 'org.bouncycastle:bcprov-jdk15to18:1.71'
fullImplementation 'info.guardianproject.panic:panic:1.0'

4
build.gradle
View File

@ -5,8 +5,8 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.8.10"
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.18.0'
}
}

813
gradle/verification-metadata.xml
View File

File diff suppressed because it is too large Load Diff

12
libs/database/build.gradle
View File

@ -65,17 +65,17 @@ dependencies {
implementation project(":libs:download")
implementation project(":libs:index")
implementation 'androidx.core:core-ktx:1.8.0'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
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 "androidx.room:room-runtime:2.5.1"
implementation "androidx.room:room-ktx:2.5.1"
kapt "androidx.room:room-compiler:2.5.1"
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.4.1"
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0"
testImplementation project(":libs:sharedTest")
testImplementation 'junit:junit:4.13.2'

4
libs/database/src/dbTest/java/org/fdroid/database/TestUtils.kt
View File

@ -102,8 +102,8 @@ internal object TestUtils {
val data = arrayOfNulls<Any>(1)
val latch = CountDownLatch(1)
val observer: Observer<T> = object : Observer<T> {
override fun onChanged(o: T?) {
data[0] = o
override fun onChanged(value: T) {
data[0] = value
latch.countDown()
removeObserver(this)
}

4
libs/database/src/main/java/org/fdroid/database/AppDao.kt
View File

@ -12,9 +12,9 @@ import androidx.lifecycle.MediatorLiveData
import androidx.lifecycle.map
import androidx.room.Dao
import androidx.room.Insert
import androidx.room.OnConflictStrategy.REPLACE
import androidx.room.OnConflictStrategy.Companion.REPLACE
import androidx.room.Query
import androidx.room.RoomWarnings.CURSOR_MISMATCH
import androidx.room.RoomWarnings.Companion.CURSOR_MISMATCH
import androidx.room.Transaction
import androidx.room.Update
import kotlinx.serialization.SerializationException

2
libs/database/src/main/java/org/fdroid/database/AppPrefsDao.kt
View File

@ -5,7 +5,7 @@ import androidx.lifecycle.distinctUntilChanged
import androidx.lifecycle.map
import androidx.room.Dao
import androidx.room.Insert
import androidx.room.OnConflictStrategy.REPLACE
import androidx.room.OnConflictStrategy.Companion.REPLACE
import androidx.room.Query
public interface AppPrefsDao {

2
libs/database/src/main/java/org/fdroid/database/RepositoryDao.kt
View File

@ -4,7 +4,7 @@ import androidx.annotation.VisibleForTesting
import androidx.lifecycle.LiveData
import androidx.room.Dao
import androidx.room.Insert
import androidx.room.OnConflictStrategy.REPLACE
import androidx.room.OnConflictStrategy.Companion.REPLACE
import androidx.room.Query
import androidx.room.RewriteQueriesToDropUnusedColumns
import androidx.room.Transaction

2
libs/database/src/main/java/org/fdroid/database/VersionDao.kt
View File

@ -3,7 +3,7 @@ package org.fdroid.database
import androidx.lifecycle.LiveData
import androidx.room.Dao
import androidx.room.Insert
import androidx.room.OnConflictStrategy.REPLACE
import androidx.room.OnConflictStrategy.Companion.REPLACE
import androidx.room.Query
import androidx.room.RewriteQueriesToDropUnusedColumns
import androidx.room.Transaction

10
libs/download/build.gradle
View File

@ -30,7 +30,7 @@ kotlin {
}
commonMain {
dependencies {
api "io.ktor:ktor-client-core:2.1.3"
api "io.ktor:ktor-client-core:2.3.0"
implementation 'io.github.microutils:kotlin-logging:2.1.21'
}
}
@ -43,7 +43,7 @@ kotlin {
// JVM is disabled for now, because Android app is including it instead of Android library
jvmMain {
dependencies {
implementation "io.ktor:ktor-client-cio:2.1.3"
implementation "io.ktor:ktor-client-cio:2.2.3"
}
}
jvmTest {
@ -55,11 +55,11 @@ kotlin {
// needed because of https://issuetracker.google.com/issues/231701341
kotlin.srcDir("src/commonMain/kotlin")
dependencies {
implementation "io.ktor:ktor-client-okhttp:2.1.3"
implementation("com.github.bumptech.glide:glide:4.12.0") {
implementation "io.ktor:ktor-client-okhttp:2.3.0"
implementation("com.github.bumptech.glide:glide:4.14.2") {
transitive = false // we don't need all that it pulls in, just the basics
}
implementation "com.github.bumptech.glide:annotations:4.12.0"
implementation "com.github.bumptech.glide:annotations:4.14.2"
}
}
androidUnitTest {

8
libs/index/build.gradle
View File

@ -33,11 +33,11 @@ kotlin {
}
commonMain {
dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0"
implementation 'io.github.microutils:kotlin-logging:2.1.21'
implementation project(":libs:download")
implementation "io.ktor:ktor-io:2.1.3"
implementation "io.ktor:ktor-io:2.3.0"
}
}
commonTest {
@ -59,8 +59,8 @@ kotlin {
}
androidMain {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-reflect:1.8.0"
implementation 'androidx.core:core-ktx:1.8.0'
implementation "org.jetbrains.kotlin:kotlin-reflect:1.8.20"
implementation 'androidx.core:core-ktx:1.10.1'
implementation "org.slf4j:slf4j-android:1.7.36"
}
}