From 3ff0bb53e91dbcebba509b1f706c8d7a9ee838e7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 5 Sep 2025 22:52:18 +0000 Subject: [PATCH 1/7] Initial plan From 2d50f5f0cc2ac809917b28542f18a137aecd82dd Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 5 Sep 2025 22:57:37 +0000 Subject: [PATCH 2/7] Initial plan for updating Collektive to 27.0.0 Co-authored-by: DanySK <1991673+DanySK@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 8 +------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d2b2c37..e676ee1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.13.0" +agp = "8.2.2" kotlin = "2.2.10" collektive = "26.1.2" coreKtx = "1.16.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a84e18..1af9e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle.kts b/settings.gradle.kts index 47c4828..db7b13b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,12 +1,6 @@ pluginManagement { repositories { - google { - content { - includeGroupByRegex("com\\.android.*") - includeGroupByRegex("com\\.google.*") - includeGroupByRegex("androidx.*") - } - } + google() mavenCentral() gradlePluginPortal() } From b8ed8587b796d6c4c3b710ecada6924cbcaf8b8d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 5 Sep 2025 23:02:38 +0000 Subject: [PATCH 3/7] Update collektive version to 27.0.0 Co-authored-by: DanySK <1991673+DanySK@users.noreply.github.com> --- gradle/libs.versions.toml | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e676ee1..6d41952 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -agp = "8.2.2" +agp = "7.4.2" kotlin = "2.2.10" -collektive = "26.1.2" +collektive = "27.0.0" coreKtx = "1.16.0" hivemq = "1.3.9" junit = "4.13.2" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e09..e650f02 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 786b6e6dc032b902a2b945409eb3887c44ec6010 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 5 Sep 2025 23:37:52 +0000 Subject: [PATCH 4/7] Revert downgrades and fix Collektive 27.0.0 API compatibility Co-authored-by: DanySK <1991673+DanySK@users.noreply.github.com> --- .../it/unibo/collektive/viewmodels/NearbyDevicesViewModel.kt | 2 +- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/it/unibo/collektive/viewmodels/NearbyDevicesViewModel.kt b/app/src/main/java/it/unibo/collektive/viewmodels/NearbyDevicesViewModel.kt index ee8da7f..2ab3025 100644 --- a/app/src/main/java/it/unibo/collektive/viewmodels/NearbyDevicesViewModel.kt +++ b/app/src/main/java/it/unibo/collektive/viewmodels/NearbyDevicesViewModel.kt @@ -55,7 +55,7 @@ class NearbyDevicesViewModel(private val dispatcher: CoroutineDispatcher = Dispa private suspend fun collektiveProgram(): Collektive> = Collektive(deviceId, MqttMailbox(deviceId, host = "broker.hivemq.com", dispatcher = dispatcher)) { - neighboring(localId).neighbors.toSet() + neighboring(localId).neighbors.set.map { it.value }.toSet() } /** diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6d41952..9c1c55e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "7.4.2" +agp = "8.13.0" kotlin = "2.2.10" collektive = "27.0.0" coreKtx = "1.16.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e650f02..37f853b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 592da779341c7404d933243f52fb2b379159abff Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 6 Sep 2025 01:42:22 +0200 Subject: [PATCH 5/7] Upgrade Gradle version to 9.0.0 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b..2a84e18 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 9b4e2ed3fb98bdea6dc2354ee44c12b067a3e06a Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 6 Sep 2025 01:42:53 +0200 Subject: [PATCH 6/7] Refine Google repository configuration in settings --- settings.gradle.kts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index db7b13b..7ad8c47 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,12 @@ pluginManagement { repositories { - google() + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } mavenCentral() gradlePluginPortal() } @@ -15,4 +21,4 @@ dependencyResolutionManagement { rootProject.name = "CollektiveExampleAndroid" include(":app") - \ No newline at end of file + From f5e74d520b9ae10a6f0d640445c9e87ae5317b22 Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 6 Sep 2025 01:43:44 +0200 Subject: [PATCH 7/7] Fix neighbor mapping in collektiveProgram function --- .../it/unibo/collektive/viewmodels/NearbyDevicesViewModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/it/unibo/collektive/viewmodels/NearbyDevicesViewModel.kt b/app/src/main/java/it/unibo/collektive/viewmodels/NearbyDevicesViewModel.kt index 2ab3025..62e30f0 100644 --- a/app/src/main/java/it/unibo/collektive/viewmodels/NearbyDevicesViewModel.kt +++ b/app/src/main/java/it/unibo/collektive/viewmodels/NearbyDevicesViewModel.kt @@ -55,7 +55,7 @@ class NearbyDevicesViewModel(private val dispatcher: CoroutineDispatcher = Dispa private suspend fun collektiveProgram(): Collektive> = Collektive(deviceId, MqttMailbox(deviceId, host = "broker.hivemq.com", dispatcher = dispatcher)) { - neighboring(localId).neighbors.set.map { it.value }.toSet() + neighboring(localId).neighbors.values.set } /**