Bump to 13.2.0, merge PRs and dependencies update

iarata · iarata · commit 22a9e1d436b8 · 2025-09-16T22:43:57.000+02:00
diff --git a/packages/health/CHANGELOG.md b/packages/health/CHANGELOG.md
@@ -1,6 +1,13 @@
 ## 13.2.0
 
-* Add get health data by UUID (see `getHealthDataByUUID()`)
+* Add get health data by UUID (see `getHealthDataByUUID()`) - PR [#1193](https://github.com/carp-dk/flutter-plugins/pull/1193), [#1194](https://github.com/carp-dk/flutter-plugins/pull/1194)
+* Add delete by UUID (`deleteByUUID()`)
+* Add support for unit conversion in `WeightRecord`, `HeightRecord`, `BodyTemperatureRecord`, and `BloodGlucoseRecord` - PR [#1212](https://github.com/carp-dk/flutter-plugins/pull/1223)
+* Update `compileSDK` to 36 - Fix [#1261](https://github.com/carp-dk/flutter-plugins/issues/1261)
+* Update Gradle to 8.9.1
+* Update `org.jetbrains.kotlin.android` to 2.1.0
+* Update `androidx.health.connect:connect-client` to 1.1.0-rc03
+* Update `device_info_plus` to 12.1.0 - Fix [#1264](https://github.com/carp-dk/flutter-plugins/issues/1264)
 
 ## 13.1.4
 
diff --git a/packages/health/android/build.gradle b/packages/health/android/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.4'
+        classpath 'com.android.tools.build:gradle:8.13.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,7 +25,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdk 34
+    compileSdk 36
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
@@ -41,7 +41,7 @@ android {
     }
     defaultConfig {
         minSdkVersion 26
-        targetSdkVersion 34
+        targetSdkVersion 36
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
@@ -51,12 +51,11 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2025.02.00')
+    def composeBom = platform('androidx.compose:compose-bom:2025.09.00')
     implementation(composeBom)
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.10"
 
-    implementation("androidx.health.connect:connect-client:1.1.0-alpha11")
-    def fragment_version = "1.8.6"
-    implementation "androidx.fragment:fragment-ktx:$fragment_version"
+    implementation("androidx.health.connect:connect-client:1.1.0-rc03")
+    implementation "androidx.fragment:fragment-ktx:1.8.9"
 
 }
diff --git a/packages/health/android/gradle/wrapper/gradle-wrapper.properties b/packages/health/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Tue Sep 16 09:25:00 CEST 2025
 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.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/packages/health/android/src/main/kotlin/cachet/plugins/health/HealthDataOperations.kt b/packages/health/android/src/main/kotlin/cachet/plugins/health/HealthDataOperations.kt
@@ -3,7 +3,6 @@ package cachet.plugins.health
 import android.util.Log
 import androidx.health.connect.client.HealthConnectClient
 import androidx.health.connect.client.HealthConnectFeatures
-import androidx.health.connect.client.feature.ExperimentalFeatureAvailabilityApi
 import androidx.health.connect.client.permission.HealthPermission
 import androidx.health.connect.client.permission.HealthPermission.Companion.PERMISSION_READ_HEALTH_DATA_HISTORY
 import androidx.health.connect.client.permission.HealthPermission.Companion.PERMISSION_READ_HEALTH_DATA_IN_BACKGROUND
@@ -103,7 +102,6 @@ class HealthDataOperations(
      * @param call Method call from Flutter (unused)
      * @param result Flutter result callback returning boolean availability status
      */
-    @OptIn(ExperimentalFeatureAvailabilityApi::class)
     fun isHealthDataHistoryAvailable(call: MethodCall, result: Result) {
         scope.launch {
             result.success(
@@ -139,7 +137,6 @@ class HealthDataOperations(
      * @param call Method call from Flutter (unused)
      * @param result Flutter result callback returning boolean availability status
      */
-    @OptIn(ExperimentalFeatureAvailabilityApi::class)
     fun isHealthDataInBackgroundAvailable(call: MethodCall, result: Result) {
         scope.launch {
             result.success(
diff --git a/packages/health/android/src/main/kotlin/cachet/plugins/health/HealthDataWriter.kt b/packages/health/android/src/main/kotlin/cachet/plugins/health/HealthDataWriter.kt
diff --git a/packages/health/example/android/app/build.gradle.kts b/packages/health/example/android/app/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 android {
     namespace = "cachet.plugins.health.health_example"
     compileSdk = flutter.compileSdkVersion
-    // ndkVersion = flutter.ndkVersion
+    ndkVersion = flutter.ndkVersion
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
diff --git a/packages/health/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/health/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
diff --git a/packages/health/example/android/settings.gradle.kts b/packages/health/example/android/settings.gradle.kts
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.7.0" apply false
-    id("org.jetbrains.kotlin.android") version "1.8.22" apply false
+    id("com.android.application") version "8.9.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
 }
 
 include(":app")
diff --git a/packages/health/example/lib/main.dart b/packages/health/example/lib/main.dart
@@ -685,13 +685,6 @@ class HealthAppState extends State<HealthApp> {
                                 WidgetStatePropertyAll(Colors.blue)),
                         child: const Text("Delete Data",
                             style: TextStyle(color: Colors.white))),
-                    TextButton(
-                        onPressed: testDeleteByClientRecordId,
-                        style: const ButtonStyle(
-                            backgroundColor:
-                                WidgetStatePropertyAll(Colors.red)),
-                        child: const Text("Test Delete by Client ID",
-                            style: TextStyle(color: Colors.white))),
                     TextButton(
                         onPressed: fetchStepData,
                         style: const ButtonStyle(
diff --git a/packages/health/example/pubspec.yaml b/packages/health/example/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: "none"
 version: 4.5.0
 
 environment:
-  sdk: ">=3.2.0 <4.0.0"
+  sdk: ">=3.8.0 <4.0.0"
   flutter: ">=3.6.0"
 
 dependencies:
diff --git a/packages/health/pubspec.yaml b/packages/health/pubspec.yaml
@@ -11,9 +11,9 @@ dependencies:
   flutter:
     sdk: flutter
   intl: '>=0.18.0 <0.21.0'
-  device_info_plus: '>=9.0.0 <12.0.0'
-  json_annotation: ^4.8.0
-  carp_serializable: ^2.0.0 # polymorphic json serialization
+  device_info_plus: '12.1.0'
+  json_annotation: ^4.9.0
+  carp_serializable: ^2.0.1 # polymorphic json serialization
 
 dev_dependencies:
   flutter_test:

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ buildscript {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
`12`		`- classpath 'com.android.tools.build:gradle:8.1.4'`
	`12`	`+ classpath 'com.android.tools.build:gradle:8.13.0'`
`13`	`13`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`14`	`14`	`}`
`15`	`15`	`}`
`@@ -25,7 +25,7 @@ apply plugin: 'com.android.library'`
`25`	`25`	`apply plugin: 'kotlin-android'`
`26`	`26`
`27`	`27`	`android {`
`28`		`- compileSdk 34`
	`28`	`+ compileSdk 36`
`29`	`29`
`30`	`30`	`compileOptions {`
`31`	`31`	`sourceCompatibility JavaVersion.VERSION_11`
`@@ -41,7 +41,7 @@ android {`
`41`	`41`	`}`
`42`	`42`	`defaultConfig {`
`43`	`43`	`minSdkVersion 26`
`44`		`- targetSdkVersion 34`
	`44`	`+ targetSdkVersion 36`
`45`	`45`	`testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
`46`	`46`	`}`
`47`	`47`	`lintOptions {`
`@@ -51,12 +51,11 @@ android {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`dependencies {`
`54`		`- def composeBom = platform('androidx.compose:compose-bom:2025.02.00')`
	`54`	`+ def composeBom = platform('androidx.compose:compose-bom:2025.09.00')`
`55`	`55`	`implementation(composeBom)`
`56`		`- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"`
	`56`	`+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.10"`
`57`	`57`
`58`		`- implementation("androidx.health.connect:connect-client:1.1.0-alpha11")`
`59`		`- def fragment_version = "1.8.6"`
`60`		`- implementation "androidx.fragment:fragment-ktx:$fragment_version"`
	`58`	`+ implementation("androidx.health.connect:connect-client:1.1.0-rc03")`
	`59`	`+ implementation "androidx.fragment:fragment-ktx:1.8.9"`
`61`	`60`
`62`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ pluginManagement {`
`18`	`18`
`19`	`19`	`plugins {`
`20`	`20`	`id("dev.flutter.flutter-plugin-loader") version "1.0.0"`
`21`		`- id("com.android.application") version "8.7.0" apply false`
`22`		`- id("org.jetbrains.kotlin.android") version "1.8.22" apply false`
	`21`	`+ id("com.android.application") version "8.9.1" apply false`
	`22`	`+ id("org.jetbrains.kotlin.android") version "2.1.0" apply false`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`include(":app")`