Merge pull request #178 from timusus/fix-taglib

Fix taglib

Author: timusus

.github/workflows/continuous-integration.yml

@@ -9,6 +9,11 @@ on:
       - synchronize
       - ready_for_review
 
+permissions:
+  contents: read
+  pull-requests: write
+  checks: write
+
 env:
   GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError"
 
@@ -37,20 +42,18 @@ jobs:
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17
+          cache: 'gradle'
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v4
 
       - name: "Lint Project"
         run: "support/scripts/lint"
 
-      - name: "Gradle cache"
-        uses: gradle/gradle-build-action@v2
-
       - name: "Build and Run Unit Tests"
         run: "support/scripts/unit-test"
 

.github/workflows/continuous_deployment.yml

@@ -4,8 +4,11 @@ on:
   push:
     branches: [main]
 
+permissions:
+  contents: read
+
 concurrency:
-  group: cd-${{ github.head_ref }}
+  group: cd-${{ github.ref }}
   cancel-in-progress: true
 
 env:
@@ -31,17 +34,18 @@ jobs:
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17
+          cache: 'gradle'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: "Lint Project"
         run: "support/scripts/lint"
 
-      - name: "Gradle cache"
-        uses: gradle/gradle-build-action@v2
-
       - name: "Build and Run Unit Tests"
         run: "support/scripts/unit-test"
 
@@ -80,12 +84,13 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: app-bundle
+          path: .
 
       - name: "Upload bundle to Play Store"
-        uses: r0adkll/upload-google-play@v1
+        uses: r0adkll/upload-google-play@v1.1.3
         with:
           serviceAccountJsonPlainText: ${{ secrets.GOOGLE_SERVICE_ACCOUNT }}
           packageName: com.simplecityapps.shuttle
-          releaseFiles: bundle/release/app-release.aab
+          releaseFiles: android/app/build/outputs/bundle/release/app-release.aab
           track: internal
           status: completed

.github/workflows/shellcheck.yml

@@ -6,14 +6,18 @@ on:
       - '.github/workflows/shellcheck.yml'
       - 'support/scripts/**'
 
+permissions:
+  contents: read
+  pull-requests: write
+
 jobs:
   shellcheck:
     name: ShellCheck
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: ShellCheck Support Scripts
-        uses: reviewdog/action-shellcheck@v1.15
+        uses: reviewdog/action-shellcheck@v1.27
         with:
           reporter: github-pr-review
           path: "support/scripts"

.github/workflows/yamllint.yml

@@ -1,17 +1,22 @@
 name: Yaml Lint
+
 on:
   pull_request:
     branches: [main]
     paths:
       - '**.yml'
 
+permissions:
+  contents: read
+  pull-requests: write
+
 jobs:
   yamllint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: yaml-lint
-        uses: reviewdog/action-yamllint@v1.6
+        uses: reviewdog/action-yamllint@v1.20
         with:
           level: error
           reporter: github-pr-review

.idea/deploymentTargetSelector.xml

@@ -13,12 +13,12 @@ plugins {
 
 android {
 
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.simplecityapps.shuttle"
-        minSdk = 21
-        targetSdk = 35
+        minSdk = 23
+        targetSdk = 36
         versionName = versionName()
         versionCode = versionCode()
         vectorDrawables.useSupportLibrary = true
@@ -79,7 +79,10 @@ android {
 
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_11.toString()
-        freeCompilerArgs = freeCompilerArgs + "-Xopt-in=kotlin.RequiresOptIn"
+        freeCompilerArgs = freeCompilerArgs + listOf(
+            "-Xopt-in=kotlin.RequiresOptIn",
+            "-Xopt-in=kotlin.time.ExperimentalTime"
+        )
     }
     lint {
         abortOnError = false
@@ -99,7 +102,9 @@ android {
         implementation(composeBom)
         androidTestImplementation(composeBom)
         implementation(libs.kotlinx.collections.immutable)
+        implementation(libs.kotlinx.datetime)
         implementation(libs.androidx.material3)
+        implementation("androidx.compose.material:material-icons-extended")
 
         // Android Studio Preview support
         implementation(libs.androidx.ui.tooling.preview)

.kotlin/sessions/kotlin-compiler-18148379643065932919.salive

@@ -8,8 +8,8 @@ import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
-import com.google.firebase.crashlytics.ktx.crashlytics
-import com.google.firebase.ktx.Firebase
+import com.google.firebase.Firebase
+import com.google.firebase.crashlytics.crashlytics
 import com.simplecityapps.shuttle.BuildConfig
 import com.simplecityapps.shuttle.persistence.GeneralPreferenceManager
 import com.simplecityapps.shuttle.ui.common.ActivityLifecycleCallbacksAdapter

android/app/build.gradle.kts

@@ -28,7 +28,7 @@ constructor(
                     Timber.v("Billing client available")
                     billingManager.queryPurchases()
                     coroutineScope.launch {
-                        billingManager.querySkuDetails()
+                        billingManager.queryProductDetails()
                     }
                 }
             }

android/app/src/main/java/com/simplecityapps/shuttle/appinitializers/CrashReportingInitializer.kt

@@ -264,7 +264,7 @@ constructor(
                                             withContext(Dispatchers.Main) {
                                                 view?.setLoading(TagEditorContract.LoadingState.WritingTags(index, editables.size))
                                             }
-                                            return@mapIndexed song to kTagLib.writeMetadata(pfd.detachFd(), metadata)
+                                            return@mapIndexed song to kTagLib.writeMetadata(pfd.detachFd(), metadata, uri.lastPathSegment)
                                         }
                                     } catch (e: IllegalStateException) {
                                         Timber.e(e, "Failed to update tags")