Skip to content

Commit c70abd3

Browse files
committed
upgraded libraries and android sdk to latest versions. Update openScale sync version to 0.4.1
1 parent 552a1ef commit c70abd3

File tree

6 files changed

+26
-18
lines changed

6 files changed

+26
-18
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
* complete rewritten in Kotlin
2+
* small bug fixes after closed beta test

src/app/build.gradle

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ plugins {
44
}
55

66
android {
7-
compileSdk 35
7+
compileSdk 36
88
defaultConfig {
99
applicationId "com.health.openscale.sync"
1010
minSdkVersion 29
11-
targetSdkVersion 35
12-
versionCode 10
13-
versionName "0.4"
11+
targetSdkVersion 36
12+
versionCode 11
13+
versionName "0.4.1"
1414
archivesBaseName = "openScale-sync-$versionName"
1515
multiDexEnabled true
1616
}
@@ -90,32 +90,32 @@ android {
9090
}
9191

9292
composeOptions {
93-
kotlinCompilerExtensionVersion '1.4.4'
93+
kotlinCompilerExtensionVersion '1.5.8'
9494
}
9595
}
9696

9797
dependencies {
9898
implementation 'androidx.core:core-ktx:1.16.0'
99-
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7'
100-
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.7'
101-
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7'
102-
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'
99+
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.1'
100+
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.9.1'
101+
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1'
102+
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1'
103103
implementation 'androidx.activity:activity-compose:1.10.1'
104-
implementation 'androidx.appcompat:appcompat:1.7.0'
104+
implementation 'androidx.appcompat:appcompat:1.7.1'
105105
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
106106
implementation 'androidx.recyclerview:recyclerview:1.4.0'
107-
implementation 'androidx.fragment:fragment-ktx:1.8.6'
108-
implementation 'androidx.navigation:navigation-compose:2.8.9'
109-
implementation platform('androidx.compose:compose-bom:2025.04.00')
107+
implementation 'androidx.fragment:fragment-ktx:1.8.8'
108+
implementation 'androidx.navigation:navigation-compose:2.9.0'
109+
implementation platform('androidx.compose:compose-bom:2025.06.01')
110110
implementation 'androidx.compose.material3:material3'
111-
implementation 'androidx.compose.runtime:runtime-livedata:1.7.8'
111+
implementation 'androidx.compose.runtime:runtime-livedata:1.8.3'
112112
implementation 'androidx.compose.ui:ui-graphics'
113-
implementation 'androidx.work:work-runtime-ktx:2.10.0'
113+
implementation 'androidx.work:work-runtime-ktx:2.10.2'
114114

115115
implementation 'com.google.android.material:material:1.12.0'
116116
implementation 'com.jakewharton.timber:timber:5.0.1'
117117
implementation 'cat.ereza:customactivityoncrash:2.3.0'
118-
implementation 'androidx.health.connect:connect-client:1.1.0-alpha11'
118+
implementation 'androidx.health.connect:connect-client:1.1.0-rc02'
119119
implementation 'com.hivemq:hivemq-mqtt-client:1.3.4'
120120
implementation 'com.google.code.gson:gson:2.10.1'
121121
implementation 'com.squareup.retrofit2:retrofit:2.8.1'

src/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<uses-permission android:name="com.health.openscale.READ_WRITE_DATA" />
88
<uses-permission android:name="com.health.openscale.light.READ_WRITE_DATA" />
99
<uses-permission android:name="com.health.openscale.pro.READ_WRITE_DATA" />
10+
<uses-permission android:name="com.health.openscale.oss.READ_WRITE_DATA" />
1011
<uses-permission android:name="android.permission.health.WRITE_BODY_FAT" />
1112
<uses-permission android:name="android.permission.health.WRITE_BODY_WATER_MASS" />
1213
<uses-permission android:name="android.permission.health.WRITE_WEIGHT" />
@@ -15,6 +16,7 @@
1516
<package android:name="com.health.openscale" />
1617
<package android:name="com.health.openscale.light" />
1718
<package android:name="com.health.openscale.pro" />
19+
<package android:name="com.health.openscale.oss" />
1820
<package android:name="com.google.android.apps.healthdata" />
1921
</queries>
2022

src/app/src/main/java/com/health/openscale/sync/core/sync/HealthConnectSync.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ class HealthConnectSync(private var healthConnectClient: HealthConnectClient) :
191191
}
192192

193193
private fun buildMetadata(measurement: OpenScaleMeasurement, type: String): Metadata {
194-
return Metadata(
194+
return Metadata.manualEntry(
195195
clientRecordId = measurement.id.toString() + "_" + type,
196196
clientRecordVersion = Instant.now().toEpochMilli()
197197
)

src/app/src/main/java/com/health/openscale/sync/gui/MainActivity.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,10 @@ class MainActivity : AppCompatActivity() {
171171
return "com.health.openscale"
172172
}
173173

174+
if (doesExist("com.health.openscale.oss")) {
175+
return "com.health.openscale.oss"
176+
}
177+
174178
if (doesExist("com.health.openscale.light")) {
175179
return "com.health.openscale.light"
176180
}

src/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
plugins {
33
id 'com.android.application' version '8.9.1' apply false
44
id 'com.android.library' version '8.9.1' apply false
5-
id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
5+
id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
66
}

0 commit comments

Comments
 (0)