Merge pull request #1408 from WalletConnect/develop

BOM_1.31.4

.github/actions/ci_relay/action.yml

@@ -16,6 +16,15 @@ runs:
         java-version: '17'
         architecture: x86_64
         cache: 'gradle'
+    - name: Cache Gradle packages
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.gradle/caches
+          ~/.gradle/wrapper
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+        restore-keys: |
+          ${{ runner.os }}-gradle-
 
     - name: Fetch Properties File
       shell: bash

.github/workflows/ci_sonarcloud.yml

@@ -62,4 +62,5 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: ./gradlew jacocoDebugTestReport --stacktrace sonar --stacktrace
+        run: ./gradlew sonar --stacktrace
+#        jacocoDebugTestReport --stacktrace

ReadMe.md

@@ -7,10 +7,23 @@ WalletConnect v2 protocols for Android applications.
 
 ####
 
+## BOM Instructions:
+To help manage compatible dependencies stay in sync, we've introduced a [BOM](https://docs.gradle.org/current/userguide/platforms.html#sub:bom_import) to the Kotlin SDK. With this, you only need to update the BOM version to get the latest SDKs. Just add the BOM as a dependency and then list the SDKs you want to include into your project.
+
+### example build.gradle.kts
+```kotlin
+dependencies {
+    implementation(platform("com.walletconnect:android-bom:{BOM version}"))
+    implementation("com.walletconnect:android-core")
+    implementation("com.walletconnect:web3wallet")
+}
+```
+
 ## SDK Chart
 
 | BOM                                                                                     | [Core SDK](core/android) | [Sign SDK](protocol/sign) | [Auth SDK](protocol/auth) | [Chat SDK](protocol/chat) | [Notify SDK](protocol/notify) | [web3wallet](product/web3wallet) | [web3modal](product/web3modal) | [WalletConnectModal](product/walletconnectmodal) |
 |-----------------------------------------------------------------------------------------|--------------------------|---------------------------|---------------------------|---------------------------|:------------------------------|----------------------------------|--------------------------------|--------------------------------------------------|
+| 1.31.4                                                                                  | 1.31.3                   | 2.31.3                    | 1.28.2                    | 1.0.0.beta30              | 1.3.3                         | 1.31.3                           | 1.5.3                          | 1.5.3                                            |
 | 1.31.3                                                                                  | 1.31.2                   | 2.31.2                    | 1.28.2                    | 1.0.0.beta30              | 1.3.2                         | 1.31.2                           | 1.5.2                          | 1.5.2                                            |
 | 1.31.1                                                                                  | 1.31.1                   | 2.31.1                    | 1.28.1                    | 1.0.0.beta26              | 1.3.1                         | 1.31.1                           | 1.5.1                          | 1.5.1                                            |
 | 1.31.0<sup>[**](https://gist.github.com/TalhaAli00/7b9e1cadf19b9dc5141cd033aa4e6172)    | 1.31.0                   | 2.31.0                    | 1.28.0                    | 1.0.0.beta25              | 1.3.0                         | 1.31.0                           | 1.5.0                          | 1.5.0                                            |
@@ -57,17 +70,5 @@ WalletConnect v2 protocols for Android applications.
 |                                                                                         | 1.0.0                    | 2.0.0-rc.5                | 1.0.0-alpha01             |                           |                               |                                  |                                |                                                  |
 
 
-## BOM Instructions:
-To help manage compatible dependencies stay in sync, we've introduced a [BOM](https://docs.gradle.org/current/userguide/platforms.html#sub:bom_import) to the Kotlin SDK. With this, you only need to update the BOM version to get the latest SDKs. Just add the BOM as a dependency and then list the SDKs you want to include into your project.    
-
-### example build.gradle.kts
-```kotlin
-dependencies {
-    implementation(platform("com.walletconnect:android-bom:{BOM version}"))
-    implementation("com.walletconnect:android-core")
-    implementation("com.walletconnect:web3wallet")
-}
-```
-
 ## License
 WalletConnect v2 is released under the Apache 2.0 license. [See LICENSE](/LICENSE) for details.

build.gradle.kts

@@ -1,42 +1,16 @@
 import com.android.build.gradle.BaseExtension
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.sonarqube.gradle.SonarExtension
 
 plugins {
-    id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
+    alias(libs.plugins.nexusPublish)
+    alias(libs.plugins.sonarqube)
     id("release-scripts")
     id("version-bump")
-    alias(libs.plugins.sonarqube)
-}
-
-buildscript {
-    repositories {
-        google()
-        mavenLocal()
-        mavenCentral()
-        maven(url = "https://plugins.gradle.org/m2/")
-    }
-    dependencies {
-        classpath("com.android.tools.build:gradle:$agpVersion")
-        classpath("org.jetbrains.dokka:dokka-core:$dokkaVersion")      // TODO: Leave version until AGP 7.3 https://github.com/Kotlin/dokka/issues/2472#issuecomment-1143604232
-        classpath("org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion")
-        classpath("com.squareup.sqldelight:gradle-plugin:$sqlDelightVersion")
-        classpath("com.google.gms:google-services:$googleServiceVersion")
-        classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.2")
-        classpath("com.google.firebase:firebase-appdistribution-gradle:4.0.0")
-    }
 }
 
 allprojects {
-    repositories {
-        google()
-        mavenLocal()
-        mavenCentral()
-        maven(url = "https://jitpack.io")
-        maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots/")
-        jcenter() // Warning: this repository is going to shut down soon
-    }
-
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    tasks.withType<KotlinCompile>().configureEach {
         kotlinOptions {
             jvmTarget = jvmVersion.toString()
         }
@@ -45,7 +19,10 @@ allprojects {
     configurations.configureEach {
         resolutionStrategy.eachDependency {
             if (requested.group == "androidx.navigation" && requested.name == "navigation-compose") {
-                useVersion(composeNavigationVersion)
+                useVersion(libs.versions.androidxNavigation.get())
+            }
+            if (requested.group == "org.bouncycastle" && requested.name == "bcprov-jdk15on") {
+                useTarget(libs.bouncyCastle)
             }
         }
     }
@@ -59,7 +36,7 @@ sonar {
                 "sonar.organization" to "walletconnect",
                 "sonar.host.url" to "https://sonarcloud.io",
                 "sonar.gradle.skipCompile" to true,
-                "sonar.coverage.exclusions" to "sample/**,**/di/**"
+                "sonar.coverage.exclusions" to "sample/**,**/di/**,/buildSrc/**,**/gradle/**,**/test/**,**/androidTest/**,**/build.gradle.kts",
             )
         )
     }
@@ -77,8 +54,8 @@ subprojects {
                 mapOf(
                     "sonar.gradle.skipCompile" to true,
                     "sonar.sources" to "${projectDir}/src/main/kotlin",
-                    "sonar.java.binaries" to buildDir,
-                    "sonar.coverage.jacoco.xmlReportPaths" to "${buildDir}/reports/jacoco/xml/jacoco.xml"
+                    "sonar.java.binaries" to layout.buildDirectory,
+                    "sonar.coverage.jacoco.xmlReportPaths" to "${layout.buildDirectory}/reports/jacoco/xml/jacoco.xml"
                 )
             )
         }
@@ -95,6 +72,20 @@ subprojects {
                         add("META-INF/NOTICE.md")
                     }
                 }
+
+                dependencies {
+                    add("testImplementation", libs.mockk)
+                    add("testImplementation", libs.jUnit)
+                    add("testRuntimeOnly", libs.jUnit.engine)
+                }
+            }
+        }
+
+        plugins.withId(rootProject.libs.plugins.javaLibrary.get().pluginId) {
+            dependencies {
+                add("testImplementation", libs.mockk)
+                add("testImplementation", libs.jUnit)
+                add("testRuntimeOnly", libs.jUnit.engine)
             }
         }
     }
@@ -105,7 +96,7 @@ subprojects {
 }
 
 task<Delete>("clean") {
-    delete(rootProject.buildDir)
+    delete(rootProject.layout.buildDirectory)
 }
 
 nexusPublishing {

buildSrc/build.gradle.kts

@@ -3,17 +3,11 @@ plugins {
     `kotlin-dsl-precompiled-script-plugins`
 }
 
-repositories {
-    google()
-    mavenCentral()
-    gradlePluginPortal()
-}
-
 dependencies {
-    implementation("com.android.tools.build:gradle:8.0.2") // when changing, remember to change version in Versions.kt in buildSrc module
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21") // when changing, remember to change version in Versions.kt in buildSrc module
-    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.7.10") // when changing, remember to change version in Versions.kt in buildSrc module
-    implementation("com.google.firebase:firebase-appdistribution-gradle:4.0.0") // when changing, remember to change version in root build.gradle.kts
+    implementation("com.android.tools.build:gradle:${libs.versions.agp.get()}")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.get()}")
+    implementation("org.jetbrains.dokka:dokka-gradle-plugin:${libs.versions.dokka.get()}")
+    implementation("com.google.firebase:firebase-appdistribution-gradle:${libs.versions.firebaseAppDistribution.get()}")
 
-    testImplementation("junit:junit:4.13.2") // when changing, remember to change version in Versions.kt in buildSrc module
+    testImplementation("junit:junit:${libs.versions.jUnit.get()}")
 }

buildSrc/settings.gradle.kts

@@ -0,0 +1,34 @@
+pluginManagement {
+    repositories {
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenLocal()
+        mavenCentral()
+        maven(url = "https://jitpack.io")
+        maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots/")
+        jcenter() // Warning: this repository is going to shut down soon
+    }
+}
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}