update dependencies and gradle

greenart7c3 · Aug 9, 2024 · 956dbd1 · 956dbd1
1 parent ddebca7
commit 956dbd1
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 16 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,10 +1,10 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("com.google.devtools.ksp")
-    id("org.jlleitschuh.gradle.ktlint") version "12.1.1"
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.kt.lint)
     alias(libs.plugins.jetbrainsComposeCompiler)
 }
 

diff --git a/app/src/main/java/com/greenart7c3/citrine/ui/dialogs/ContactsDialog.kt b/app/src/main/java/com/greenart7c3/citrine/ui/dialogs/ContactsDialog.kt
@@ -174,15 +174,15 @@ fun ContactsDialog(pubKey: String, onClose: () -> Unit) {
                                     ),
                                 )
                                 Text(
-                                    "Following: ${event.verifiedFollowKeySet.size}",
+                                    "Following: ${event.verifiedFollowKeySet().size}",
                                     modifier = Modifier.padding(horizontal = 6.dp),
                                 )
                                 Text(
-                                    "Communities: ${event.verifiedFollowCommunitySet.size}",
+                                    "Communities: ${event.verifiedFollowAddressSet().size}",
                                     modifier = Modifier.padding(horizontal = 6.dp),
                                 )
                                 Text(
-                                    "Hashtags: ${event.verifiedFollowTagSet.size}",
+                                    "Hashtags: ${event.countFollowTags()}",
                                     modifier = Modifier.padding(horizontal = 6.dp),
                                 )
                                 Text(

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,17 +2,20 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.5.1" apply false
-    id("org.jetbrains.kotlin.android") version "2.0.0" apply false
-    id ("com.android.library") version "8.5.1" apply false
-    id("com.google.devtools.ksp") version "2.0.0-1.0.22" apply false
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.ksp) apply false
+    alias(libs.plugins.kt.lint) apply false
 }
 
 tasks.register<Copy>("installGitHook") {
     from(File(rootProject.rootDir, "git-hooks/pre-commit"))
     from(File(rootProject.rootDir, "git-hooks/pre-push"))
     into(File(rootProject.rootDir, ".git/hooks"))
-    fileMode = 0b111101101
+    filePermissions {
+        unix(0b111101101)
+    }
 }
 
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,10 +14,13 @@ navigationCompose = "2.7.7"
 okhttp = "5.0.0-alpha.14"
 room = "2.6.1"
 storage = "1.5.5"
-workRuntimeKtx = "2.9.0"
+workRuntimeKtx = "2.9.1"
 material3 = "1.2.1"
-quartz = "0.89.7"
+quartz = "0.89.9"
 kotlin = "2.0.0"
+agp = "8.5.2"
+ksp = "2.0.0-1.0.22"
+ktlint = "12.1.1"
 
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
@@ -52,3 +55,8 @@ lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-com
 
 [plugins]
 jetbrainsComposeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+android-application = { id = "com.android.application", version.ref = "agp" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+android-library = { id = "com.android.library", version.ref = "agp" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+kt-lint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME