Skip to content

Commit f45914e

Browse files
authored
Merge pull request #1407 from WalletConnect/fix/release/update_dependencies
fix:release:update dependencies
2 parents d8a4397 + 1fd34ad commit f45914e

File tree

19 files changed

+99
-111
lines changed

19 files changed

+99
-111
lines changed

.github/workflows/ci_sonarcloud.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,5 @@ jobs:
6262
env:
6363
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
6464
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
65-
run: ./gradlew jacocoDebugTestReport --stacktrace sonar --stacktrace
65+
run: ./gradlew sonar --stacktrace
66+
# jacocoDebugTestReport --stacktrace

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ sonar {
3636
"sonar.organization" to "walletconnect",
3737
"sonar.host.url" to "https://sonarcloud.io",
3838
"sonar.gradle.skipCompile" to true,
39-
"sonar.coverage.exclusions" to "sample/**,**/di/**"
39+
"sonar.coverage.exclusions" to "sample/**,**/di/**,/buildSrc/**,**/gradle/**,**/test/**,**/androidTest/**,**/build.gradle.kts",
4040
)
4141
)
4242
}

buildSrc/src/main/kotlin/jacoco-report.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ private val sourceDirectoriesTree = fileTree("${project.projectDir}") {
2424
"src/debug/**",
2525
)
2626
}
27-
private val classDirectoriesTree = fileTree("${project.buildDir}") {
27+
private val classDirectoriesTree = fileTree("${project.layout.buildDirectory}") {
2828
include(
2929
"intermediates/javac/debug/classes/**",
3030
"tmp/kotlin-classes/debug/**"
3131
)
3232
exclude(fileFilter)
3333
}
34-
private val executionDataTree = fileTree(project.buildDir) {
34+
private val executionDataTree = fileTree(project.layout.buildDirectory) {
3535
include(
3636
"jacoco/testDebugUnitTest.exec"
3737
)
@@ -46,8 +46,8 @@ tasks {
4646
reports {
4747
xml.required.set(true)
4848
html.required.set(true)
49-
html.outputLocation.set(file("${buildDir}/reports/jacoco/html"))
50-
xml.outputLocation.set(file("${buildDir}/reports/jacoco/xml/jacoco.xml"))
49+
html.outputLocation.set(file("${layout.buildDirectory}/reports/jacoco/html"))
50+
xml.outputLocation.set(file("${layout.buildDirectory}/reports/jacoco/xml/jacoco.xml"))
5151
}
5252
sourceDirectories.setFrom(sourceDirectoriesTree)
5353
classDirectories.setFrom(files(classDirectoriesTree))

buildSrc/src/main/kotlin/publish-module-android.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ tasks {
1212
register("javadocJar", Jar::class) {
1313
dependsOn(named("dokkaHtml"))
1414
archiveClassifier.set("javadoc")
15-
from("$buildDir/dokka/html")
15+
from("${layout.buildDirectory}/dokka/html")
1616
}
1717

18-
@Suppress("UnstableApiUsage")
1918
register("sourcesJar", Jar::class) {
2019
archiveClassifier.set("sources")
2120
from(
@@ -45,7 +44,6 @@ afterEvaluate {
4544
name.set("WalletConnect ${requireNotNull(extra.get(KEY_SDK_NAME))}")
4645
description.set("${requireNotNull(extra.get(KEY_SDK_NAME))} SDK for WalletConnect")
4746
url.set("https://github.com/WalletConnect/WalletConnectKotlinV2")
48-
4947
licenses {
5048
license {
5149
name.set("The Apache License, Version 2.0")

buildSrc/src/main/kotlin/release-scripts.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import org.apache.tools.ant.taskdefs.condition.Os
2+
import java.util.Locale
23
import kotlin.reflect.full.safeCast
34

45
// Example ./gradlew releaseAllSDKs -Ptype=local
@@ -9,7 +10,7 @@ tasks.register("releaseAllSDKs") {
910
?.run(String::class::safeCast)
1011
?.run {
1112
println("Converting parameter to an supported ReleaseType value")
12-
ReleaseType.valueOf(this.toUpperCase())
13+
ReleaseType.valueOf(this.uppercase(Locale.getDefault()))
1314
}?.let { releaseType ->
1415
generateListOfModuleTasks(releaseType).forEach { task ->
1516
println("Executing Task: $task")

core/android/build.gradle.kts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,8 @@ dependencies {
8989
api(libs.coroutines)
9090
implementation(libs.scarlet.android)
9191
implementation(libs.bundles.sqlDelight)
92-
api(libs.sqlCipher) {
93-
artifact {
94-
type = "aar"
95-
}
96-
}
92+
//noinspection UseTomlInstead
93+
api("net.zetetic:android-database-sqlcipher:4.5.4@aar")
9794
implementation(libs.relinker)
9895
api(libs.androidx.security)
9996
api(libs.koin.android)

core/modal/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ android {
3838
}
3939
kotlinOptions {
4040
jvmTarget = jvmVersion.toString()
41-
freeCompilerArgs = freeCompilerArgs + "-Xopt-in=kotlin.time.ExperimentalTime"
41+
freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.time.ExperimentalTime"
4242
}
4343
buildFeatures {
4444
compose = true

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ android.useAndroidX=true
1818
android.enableJetifier=false
1919
# Kotlin code style for this project: "official" or "obsolete":
2020
kotlin.code.style=official
21-
android.enableR8.fullMode=false
21+
android.enableR8.fullMode=false
22+
org.gradle.warning.mode=all

gradle/libs.versions.toml

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
11
[versions]
2-
jerseyCommon = "3.1.0"
3-
kotlin = "1.9.23"
4-
ksp = "1.9.23-1.0.19"
5-
agp = "8.3.1"
2+
jerseyCommon = "3.1.6"
3+
kotlin = "1.9.24"
4+
ksp = "1.9.24-1.0.20"
5+
agp = "8.4.1"
66

77
minSdk = "23"
88
targetSdk = "34"
99
compileSdk = "34"
1010

11-
composeCompiler = "1.5.11"
12-
composeBOM = "2024.03.00"
13-
composeViewModel = "2.6.1"
14-
accompanist = "0.31.3-beta"
11+
composeCompiler = "1.5.14"
12+
composeBOM = "2024.05.00"
13+
composeViewModel = "2.8.0"
14+
accompanist = "0.34.0"
1515

16-
coroutines = "1.7.3"
16+
coroutines = "1.8.1"
1717
sqlDelight = "2.0.0"
18-
dokka = "1.7.10"
19-
moshi = "1.15.0"
20-
googleService = "4.3.15"
18+
dokka = "1.9.20"
19+
moshi = "1.15.1"
20+
googleService = "4.4.1"
2121
scarlet = "1.0.1"
22-
koin = "3.4.2"
23-
retrofit = "2.9.0"
24-
okhttp = "4.11.0"
22+
koin = "3.5.6"
23+
retrofit = "2.11.0"
24+
okhttp = "4.12.0"
2525
bouncyCastle = "1.77"
26-
sqlCipher = "4.5.3"
26+
sqlCipher = "4.5.4"
2727
multibase = "1.1.1"
2828
json = "20220924"
2929
timber = "5.0.1"
3030
web3j = "4.9.8-hotfix"
31-
kethereum = "0.85.7"
32-
wsRestJava = "3.1.0"
31+
kethereum = "0.86.0"
32+
wsRestJava = "4.0.0"
3333
relinker = "1.4.5"
34-
coil = "2.3.0"
34+
coil = "2.6.0"
3535
customQrGenerator = "1.6.2"
3636
beagle = "2.9.0"
3737
coinbase = "1.0.4"
3838

39-
firebaseBOM = "32.2.0"
40-
firebaseAppDistribution = "4.0.0"
39+
firebaseBOM = "33.0.0"
40+
firebaseAppDistribution = "5.0.0"
4141

42-
androidxCore = "1.10.1"
42+
androidxCore = "1.13.1"
4343
androidxAppCompat = "1.6.1"
44-
andoridxMaterial = "1.9.0"
45-
androidxLifecycle = "2.6.1"
44+
andoridxMaterial = "1.12.0"
45+
androidxLifecycle = "2.8.0"
4646
androidxTest = "1.5.0"
4747
androidxTestOrchestration = "1.4.2"
4848
androidxSecurity = "1.1.0-alpha06"
49-
androidxDatastore = "1.0.0"
50-
androidxNavigation = "2.5.3"
49+
androidxDatastore = "1.1.1"
50+
androidxNavigation = "2.7.7"
5151

5252
jUnit = "4.13.2"
53-
robolectric = "4.9.2"
54-
mockk = "1.13.5"
55-
turbine = "1.0.0"
56-
paparazzi = "1.3.1"
53+
robolectric = "4.12.2"
54+
mockk = "1.13.11"
55+
turbine = "1.1.0"
56+
paparazzi = "1.3.4"
5757

5858
[libraries]
5959
sqlDelight-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqlDelight" }
@@ -73,7 +73,7 @@ androidx-datastore = { module = "androidx.datastore:datastore-preferences", vers
7373
androidx-core = { module = "androidx.core:core-ktx", version.ref = "androidxCore" }
7474
androidx-appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidxAppCompat" }
7575
androidx-material = { module = "com.google.android.material:material", version.ref = "andoridxMaterial" }
76-
androidx-testJunit = { module = "androidx.test.ext:junit-ktx", version = "1.1.3" }
76+
androidx-testJunit = { module = "androidx.test.ext:junit-ktx", version = "1.1.5" }
7777
androidx-testCore = { module = "androidx.test:core-ktx", version.ref = "androidxTest" }
7878
androidx-testOrchestrator = { module = "androidx.test:orchestrator", version.ref = "androidxTestOrchestration" }
7979
androidx-testRunner = { module = "androidx.test:runner", version = "1.5.2" }
@@ -84,11 +84,11 @@ androidx-compose-ui = { module = "androidx.compose.ui:ui" }
8484
androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
8585
androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
8686
androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
87-
androidx-compose-ui-test-junit = { module = "androidx.compose.ui:ui-test-junit4", version = "1.5.1" }
87+
androidx-compose-ui-test-junit = { module = "androidx.compose.ui:ui-test-junit4", version = "1.6.7" }
8888
androidx-compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" }
8989
androidx-compose-navigation-testing = { module = "androidx.navigation:navigation-testing", version.ref = "androidxNavigation" }
9090
androidx-compose-lifecycle = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "composeViewModel" }
91-
androidx-compose-material = { module = "androidx.compose.material:material", version = "1.5.0-alpha04" }
91+
androidx-compose-material = { module = "androidx.compose.material:material", version = "1.6.7" }
9292

9393
coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
9494
coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
@@ -190,7 +190,7 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
190190
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
191191
kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
192192

193-
firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "2.9.9" }
193+
firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "3.0.1" }
194194
firebase-distribution = { id = "com.google.firebase.appdistribution", version.ref = "firebaseAppDistribution" }
195195

196196
google-services = { id = "com.google.gms.google-services", version.ref = "googleService" }

gradle/wrapper/gradle-wrapper.jar

9.17 KB
Binary file not shown.

0 commit comments

Comments
 (0)