fixup! fixup! chore: update gradle wrapper

ably · Sep 25, 2024 · 73c5394 · 73c5394
1 parent e93933e
commit 73c5394
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 157 deletions.
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
@@ -51,13 +51,8 @@ dependencies {
     testImplementation(libs.bundles.tests)
     implementation(project(":network-client-core"))
     runtimeOnly(project(":network-client-default"))
-    implementation("com.google.firebase:firebase-messaging:22.0.0")
-    androidTestImplementation("com.android.support.test:runner:0.5")
-    androidTestImplementation("com.android.support.test:rules:0.5")
-    androidTestImplementation("com.crittercism.dexmaker:dexmaker:1.4")
-    androidTestImplementation("com.crittercism.dexmaker:dexmaker-dx:1.4")
-    androidTestImplementation("com.crittercism.dexmaker:dexmaker-mockito:1.4")
-    androidTestImplementation("net.sourceforge.streamsupport:android-retrostreams:1.7.4")
+    implementation(libs.firebase.messaging)
+    androidTestImplementation(libs.bundles.instrumental.android)
 }
 
 configurations {

diff --git a/android/maven.gradle b/android/maven.gradle
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,6 +10,11 @@ nanohttpd = "2.3.0"
 mockito = "1.10.19"
 concurrentunit = "0.4.2"
 slf4j = "1.7.30"
+build-config = "5.4.0"
+firebase-messaging = "22.0.0"
+android-test = "0.5"
+dexmaker = "1.4"
+android-retrostreams = "1.7.4"
 
 [libraries]
 gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
@@ -24,10 +29,19 @@ nanohttpd-websocket = { group = "org.nanohttpd", name = "nanohttpd-websocket", v
 mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
 concurrentunit = { group = "net.jodah", name = "concurrentunit", version.ref = "concurrentunit" }
 slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }
+firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging", version.ref = "firebase-messaging" }
+android-test-runner = { group = "com.android.support.test", name = "runner", version.ref = "android-test" }
+android-test-rules = { group = "com.android.support.test", name = "rules", version.ref = "android-test" }
+dexmaker = { group = "com.crittercism.dexmaker", name = "dexmaker", version.ref = "dexmaker" }
+dexmaker-dx = { group = "com.crittercism.dexmaker", name = "dexmaker-dx", version.ref = "dexmaker" }
+dexmaker-mockito = { group = "com.crittercism.dexmaker", name = "dexmaker-mockito", version.ref = "dexmaker" }
+android-retrostreams = { group = "net.sourceforge.streamsupport", name = "android-retrostreams", version.ref = "android-retrostreams" }
 
 [bundles]
 common = ["msgpack", "java-websocket", "vcdiff-core"]
 tests = ["junit","hamcrest-all", "nanohttpd", "nanohttpd-nanolets", "nanohttpd-websocket", "mockito-core", "concurrentunit", "slf4j-simple"]
+instrumental-android = ["android-test-runner", "android-test-rules", "dexmaker", "dexmaker-dx", "dexmaker-mockito", "android-retrostreams"]
 
 [plugins]
 android-library = { id = "com.android.library", version.ref = "agp" }
+build-config = { id = "com.github.gmazzo.buildconfig", version.ref = "build-config" }
diff --git a/java/build.gradle.kts b/java/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
 plugins {
-    id("com.github.gmazzo.buildconfig") version "5.4.0"
+    alias(libs.plugins.build.config)
     checkstyle
     `java-library`
 }