From 3200ed9b790b058e0a145028a0ae6cd7ca0d3c74 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Fri, 23 Sep 2022 11:31:59 +0200 Subject: Update gradle --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b6d47fa7..007be88c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip -- cgit v1.2.3 From 653f6ef1bc1c4b857d8467d25bac5937d57102b5 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Mon, 17 Apr 2023 14:56:49 +0200 Subject: Update gradle files --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 007be88c..8b3d4701 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip -- cgit v1.2.3 From ab5ce84a3414dd433781e05d7fcff9291f0a4f92 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Thu, 27 Jul 2023 12:58:44 +0200 Subject: Update gradle build tools --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8b3d4701..06fe19dc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip -- cgit v1.2.3 From 5719f6dc6bc35096af5922d410c2175463fea974 Mon Sep 17 00:00:00 2001 From: conorsmith Date: Sun, 3 Sep 2023 16:40:59 +0200 Subject: Use gradle catalog to align project dependencies across modules/gradle files --- gradle/libs.versions.toml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 gradle/libs.versions.toml (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..f12ff9c9 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,40 @@ +[versions] +kotlin = "1.9.0" +constraintlayout = "2.1.4" +cardview = "1.0.0" +recyclerview = "1.3.0" +appcompat = "1.6.1" +mpandroidchart = "v3.1.0" +okhttp = "4.10.0" +core-ktx = "1.10.1" +fragment-ktx = "1.6.0" +preference-ktx = "1.2.0" +material = "1.7.0" +androidx-webkit = "1.7.0" +androidx-lifecycle-viewmodel-ktx = "2.6.1" +androidx-lifecycle-runtime-ktx = "2.6.1" +androidx-security-crypto = "1.1.0-alpha06" +androidx-annotation = "1.6.0" +android-gradle-plugin = "8.1.1" + +[libraries] +kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" } +androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } +androidx-cardview = { group = "androidx.cardview", name = "cardview", version.ref = "cardview" } +androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" } +androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } +mpandroidchart = { group = "com.github.PhilJay", name = "MPAndroidChart", version.ref = "mpandroidchart" } +square-okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" } +androidx-core-ktx = { group = "androidx.core", name = "core", version.ref = "core-ktx" } +androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragment-ktx" } +androidx-preference-ktx = { group = "androidx.preference", name = "preference-ktx", version.ref = "preference-ktx" } +material = { group = "com.google.android.material", name = "material", version.ref = "material" } +androidx-webkit = { group = "androidx.webkit", name = "webkit", version.ref = "androidx-webkit" } +androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-viewmodel-ktx" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidx-lifecycle-runtime-ktx" } +androidx-security-crypto = { group = "androidx.security", name = "security-crypto", version.ref = "androidx-security-crypto" } +androidx-annotation = { group = "androidx.annotation", name = "annotation", version.ref = "androidx-annotation" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } \ No newline at end of file -- cgit v1.2.3 From 715112cd9fb96aae0d94b3de9b6530000a3f4f5c Mon Sep 17 00:00:00 2001 From: conorsmith Date: Sun, 3 Sep 2023 17:31:11 +0200 Subject: Migrate test dependencies to version catalog + sort dependencies --- gradle/libs.versions.toml | 62 ++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 25 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f12ff9c9..4a045e34 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,39 +1,51 @@ [versions] -kotlin = "1.9.0" -constraintlayout = "2.1.4" -cardview = "1.0.0" -recyclerview = "1.3.0" -appcompat = "1.6.1" -mpandroidchart = "v3.1.0" -okhttp = "4.10.0" -core-ktx = "1.10.1" -fragment-ktx = "1.6.0" -preference-ktx = "1.2.0" -material = "1.7.0" +android-gradle-plugin = "8.1.1" +androidx-annotation = "1.6.0" +androidx-appcompat = "1.6.1" +android-view-material = "1.7.0" +androidx-core-ktx = "1.10.1" +androidx-fragment-ktx = "1.6.0" +androidx-preference-ktx = "1.2.0" androidx-webkit = "1.7.0" androidx-lifecycle-viewmodel-ktx = "2.6.1" androidx-lifecycle-runtime-ktx = "2.6.1" androidx-security-crypto = "1.1.0-alpha06" -androidx-annotation = "1.6.0" -android-gradle-plugin = "8.1.1" +androidx-constraintlayout = "2.1.4" +androidx-cardview = "1.0.0" +androidx-recyclerview = "1.3.0" +mpandroidchart = "v3.1.0" +kotlin = "1.9.0" +square-okhttp = "4.10.0" + +# Test +androidx-test-core = "1.4.0" +junit = "4.13.2" +mockito-core = "3.9.0" +robolectric = "4.10.2" [libraries] -kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" } -androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } -androidx-cardview = { group = "androidx.cardview", name = "cardview", version.ref = "cardview" } -androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" } -androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } -mpandroidchart = { group = "com.github.PhilJay", name = "MPAndroidChart", version.ref = "mpandroidchart" } -square-okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" } -androidx-core-ktx = { group = "androidx.core", name = "core", version.ref = "core-ktx" } -androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragment-ktx" } -androidx-preference-ktx = { group = "androidx.preference", name = "preference-ktx", version.ref = "preference-ktx" } -material = { group = "com.google.android.material", name = "material", version.ref = "material" } +android-view-material = { group = "com.google.android.material", name = "material", version.ref = "android-view-material" } +androidx-annotation = { group = "androidx.annotation", name = "annotation", version.ref = "androidx-annotation" } +androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" } +androidx-cardview = { group = "androidx.cardview", name = "cardview", version.ref = "androidx-cardview" } +androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" } +androidx-core-ktx = { group = "androidx.core", name = "core", version.ref = "androidx-core-ktx" } +androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "androidx-fragment-ktx" } +androidx-preference-ktx = { group = "androidx.preference", name = "preference-ktx", version.ref = "androidx-preference-ktx" } androidx-webkit = { group = "androidx.webkit", name = "webkit", version.ref = "androidx-webkit" } androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-viewmodel-ktx" } androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidx-lifecycle-runtime-ktx" } +androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidx-recyclerview" } androidx-security-crypto = { group = "androidx.security", name = "security-crypto", version.ref = "androidx-security-crypto" } -androidx-annotation = { group = "androidx.annotation", name = "annotation", version.ref = "androidx-annotation" } +mpandroidchart = { group = "com.github.PhilJay", name = "MPAndroidChart", version.ref = "mpandroidchart" } +kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" } +square-okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "square-okhttp" } + +# Test +androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidx-test-core" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito-core" } +robolectric = { group = "org.robolectric:robolectric:4.10.2", name = "robolectric", version.ref = "robolectric" } [plugins] android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" } -- cgit v1.2.3 From 70683fb566625bc51673b22be974b494b64e0108 Mon Sep 17 00:00:00 2001 From: conorsmith Date: Sun, 3 Sep 2023 17:42:01 +0200 Subject: - Fix incorrect robolectric dep definition - Align test implementation kotlin dependency - Re-add core.ktx dependency --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4a045e34..412276a0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -45,7 +45,7 @@ square-okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidx-test-core" } junit = { group = "junit", name = "junit", version.ref = "junit" } mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito-core" } -robolectric = { group = "org.robolectric:robolectric:4.10.2", name = "robolectric", version.ref = "robolectric" } +robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" } [plugins] android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" } -- cgit v1.2.3 From 87aac67b611f616aebfb722679b40e3f49576f01 Mon Sep 17 00:00:00 2001 From: conorsmith Date: Sun, 3 Sep 2023 18:14:54 +0200 Subject: Add bouncycastle dependency to version catalog --- gradle/libs.versions.toml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 412276a0..e98a714f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,6 +13,7 @@ androidx-security-crypto = "1.1.0-alpha06" androidx-constraintlayout = "2.1.4" androidx-cardview = "1.0.0" androidx-recyclerview = "1.3.0" +bouncycastle = "1.49" mpandroidchart = "v3.1.0" kotlin = "1.9.0" square-okhttp = "4.10.0" @@ -38,6 +39,11 @@ androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecyc androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidx-recyclerview" } androidx-security-crypto = { group = "androidx.security", name = "security-crypto", version.ref = "androidx-security-crypto" } mpandroidchart = { group = "com.github.PhilJay", name = "MPAndroidChart", version.ref = "mpandroidchart" } +org-bouncycastle-bcprov-jdk15on = { group = "org.bouncycastle", name = "bcprov-jdk15on", version.ref = "bouncycastle" } +org-bouncycastle-bcprov-ext-jdk15on = { group = "org.bouncycastle", name = "bcprov-ext-jdk15on", version.ref = "bouncycastle" } +org-bouncycastle-bcpkix-jdk15on = { group = "org.bouncycastle", name = "bcpkix-jdk15on", version.ref = "bouncycastle" } +org-bouncycastle-bcmail-jdk15on = { group = "org.bouncycastle", name = "bcmail-jdk15on", version.ref = "bouncycastle" } +org-bouncycastle-bcpg-jdk15on = { group = "org.bouncycastle", name = "bcpg-jdk15on", version.ref = "bouncycastle" } kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" } square-okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "square-okhttp" } -- cgit v1.2.3