Merge pull request #6 from lucka-me/upgrade-dependencies

Upgrade dependencies

README.md

@@ -2,9 +2,9 @@
 
 ![](app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png)
 
-[![Lines of code](https://img.shields.io/tokei/lines/github/lucka-me/refrain)](# "Repository")
-[![Target API](https://img.shields.io/badge/target_api-33-78C257.svg)](https://developer.android.com/about/versions/13 "Android 13")
-[![Min API](https://img.shields.io/badge/min_api-28-78C257.svg)](https://developer.android.com/about/versions/pie "Android 9 Pie")
+[![Lines of code](https://aschey.tech/tokei/github/lucka-me/refrain)](# "Repository")
+[![Target API](https://img.shields.io/badge/target_api-34-78C257.svg)](https://developer.android.com/about/versions/14 "Android 14")
+[![Minimal API](https://img.shields.io/badge/min_api-28-78C257.svg)](https://developer.android.com/about/versions/pie "Android 9 Pie")
 
 Trace locations with Android, built with Jetpack Compose.
 

app/build.gradle

@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "labs.lucka.refrain"
         minSdk 28
-        targetSdk 33
+        targetSdk 34
         versionCode 7
         versionName "1.5.0"
         vectorDrawables {
@@ -34,6 +34,7 @@ android {
     }
     buildFeatures {
         compose true
+        buildConfig true
     }
     composeOptions {
         kotlinCompilerExtensionVersion '1.4.0'
@@ -47,19 +48,19 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.activity:activity-compose:1.7.2'
+    implementation 'androidx.activity:activity-compose:1.8.2'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation "androidx.compose.material:material-icons-extended:1.4.3"
-    implementation 'androidx.compose.material3:material3:1.1.0'
-    implementation "androidx.compose.ui:ui:1.4.3"
-    implementation "androidx.compose.ui:ui-tooling-preview:1.4.3"
-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation "androidx.compose.material:material-icons-extended:1.6.2"
+    implementation 'androidx.compose.material3:material3:1.2.0'
+    implementation "androidx.compose.ui:ui:1.6.2"
+    implementation "androidx.compose.ui:ui-tooling-preview:1.6.2"
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.datastore:datastore-preferences:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
-    implementation "com.google.accompanist:accompanist-permissions:$accompanist_version"
-    implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version"
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
+    implementation 'com.google.accompanist:accompanist-permissions:0.34.0'
+    implementation 'com.google.accompanist:accompanist-systemuicontroller:0.34.0'
+    implementation 'com.google.android.material:material:1.11.0'
 
-    debugImplementation "androidx.compose.ui:ui-tooling:1.4.3"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:1.4.3"
+    debugImplementation "androidx.compose.ui:ui-tooling:1.6.2"
+    debugImplementation "androidx.compose.ui:ui-test-manifest:1.6.2"
 }

app/src/main/AndroidManifest.xml

@@ -18,7 +18,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Refrain"
-        tools:targetApi="33">
+        tools:targetApi="34">
         <activity
             android:name=".MainActivity"
             android:exported="true">

app/src/main/java/labs/lucka/refrain/ui/RefrainModel.kt

@@ -59,7 +59,8 @@ class RefrainModel : ViewModel() {
     }
 
     fun onResume(context: Context) {
-        serviceIntent = Intent(context, TraceService::class.java)
+        val serviceIntent = Intent(context, TraceService::class.java)
+        this.serviceIntent = serviceIntent
         context.startForegroundService(serviceIntent)
         serviceBound = context.bindService(
             serviceIntent, serviceConnection, Service.BIND_AUTO_CREATE

app/src/main/java/labs/lucka/refrain/ui/content/main/OutputFormatCard.kt

@@ -5,7 +5,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.InsertDriveFile
+import androidx.compose.material.icons.automirrored.filled.InsertDriveFile
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -30,7 +30,7 @@ fun OutputFormatCard(mutable: Boolean) {
 
     ExpandableCard(
         stringResource(R.string.output_format),
-        Icons.Filled.InsertDriveFile,
+        Icons.AutoMirrored.Filled.InsertDriveFile,
         stringResource(R.string.output_format_alt)
     ) {
         FormatField(R.string.output_format_csv, enableCSV, mutable) { enableCSV = !enableCSV }

build.gradle

@@ -1,14 +1,13 @@
 buildscript {
     ext {
-        accompanist_version = '0.25.1'
     }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.0.2' apply false
-    id 'com.android.library' version '8.0.2' apply false
+    id 'com.android.application' version '8.3.1' apply false
+    id 'com.android.library' version '8.3.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }

gradle.properties

@@ -22,5 +22,4 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 org.gradle.unsafe.configuration-cache=tue
-android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Jan 20 23:37:28 CST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME