Merge branch 'main' into gradle-versions-check

Author: pcolby

.github/workflows/build.yaml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '17'
@@ -47,8 +47,8 @@ jobs:
       env:
         MATRIX_OS: ${{ matrix.os }}
     - name: Upload build outputs
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: build-outputs
+        name: build-outputs-${{ matrix.os }}
         path: ${{ runner.temp }}/build-outputs
         if-no-files-found: error

.github/workflows/codeql.yaml

@@ -15,17 +15,17 @@ jobs:
       security-events: write
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '17'
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: java
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.gitignore

@@ -1,3 +1,4 @@
+.envrc
 .gradle
 .idea
 build

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased][]
 
+## [1.3.1][] (2023-12-04)
+
+Enabled code minification and resource shrinkage.
+
 ## [1.3.0][] (2023-10-21)
 
 Added tile update timer to solve race condition.
@@ -26,7 +30,8 @@ Added translations for 86 languages.
 
 Initial release.
 
-[Unreleased]: https://github.com/pcolby/nfc-quick-settings/compare/v1.3.0...HEAD
+[Unreleased]: https://github.com/pcolby/nfc-quick-settings/compare/v1.3.1...HEAD
+[1.3.1]: https://github.com/pcolby/nfc-quick-settings/releases/tag/v1.3.1
 [1.3.0]: https://github.com/pcolby/nfc-quick-settings/releases/tag/v1.3.0
 [1.2.2]: https://github.com/pcolby/nfc-quick-settings/releases/tag/v1.2.2
 [1.2.1]: https://github.com/pcolby/nfc-quick-settings/releases/tag/v1.2.1

app/build.gradle

@@ -30,15 +30,17 @@ android {
         applicationId "au.id.colby.nfcquicksettings"
         minSdk 24
         targetSdk 34
-        versionCode 8
-        versionName "1.3.0-post"
+        versionCode 9
+        versionName "1.3.2-pre"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            ndk { debugSymbolLevel 'FULL' }
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            shrinkResources true
             if (signingConfigs.hasProperty("release")) signingConfig = signingConfigs.release
         }
     }
@@ -60,7 +62,7 @@ base {
 dependencies {
     implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.10.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

app/src/androidTest/java/au/id/colby/nfcquicksettings/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 Paul Colby <[email protected]>
+// SPDX-FileCopyrightText: 2023-2024 Paul Colby <[email protected]>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 package au.id.colby.nfcquicksettings

app/src/main/java/au/id/colby/nfcquicksettings/NfcTileService.kt

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 Paul Colby <[email protected]>
+// SPDX-FileCopyrightText: 2023-2024 Paul Colby <[email protected]>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 package au.id.colby.nfcquicksettings
@@ -14,18 +14,19 @@ import android.provider.Settings
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
 import android.util.Log
-import au.id.colby.nfcquicksettings.R.*
+import au.id.colby.nfcquicksettings.R.string
 import java.util.Timer
 import kotlin.concurrent.fixedRateTimer
 
+private const val TAG = "NfcTileService"
+
 /**
  * A custom Quick Settings tile for NFC.
  *
  * The tile shows the current NFC status (On, Off, or Unavailable), and when clicked, starts the
  * device's NFC Settings activity.
  */
 class NfcTileService : TileService() {
-    private val TAG = "NfcTileService"
     private var updateTimer: Timer? = null
 
     /**
@@ -44,7 +45,7 @@ class NfcTileService : TileService() {
                 Log.d(TAG, "Updating tile")
                 state = if (adapter == null) Tile.STATE_INACTIVE else
                     if (adapter.isEnabled) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) subtitle = getText(
+                if (SDK_INT >= Build.VERSION_CODES.Q) subtitle = getText(
                     if (adapter == null) string.tile_subtitle_unavailable else
                         if (adapter.isEnabled) string.tile_subtitle_active else string.tile_subtitle_inactive
                 )
@@ -78,6 +79,7 @@ class NfcTileService : TileService() {
         Log.d(TAG, "onClick")
         val intent = Intent(Settings.ACTION_NFC_SETTINGS)
         intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        //noinspection StartActivityAndCollapseDeprecated
         if (SDK_INT < UPSIDE_DOWN_CAKE) @Suppress("DEPRECATION") startActivityAndCollapse(intent)
         else startActivityAndCollapse(PendingIntent.getActivity(this, 0, intent, FLAG_IMMUTABLE))
     }

app/src/test/java/au/id/colby/nfcquicksettings/ExampleUnitTest.kt

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 Paul Colby <[email protected]>
+// SPDX-FileCopyrightText: 2023-2024 Paul Colby <[email protected]>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 package au.id.colby.nfcquicksettings
@@ -13,7 +13,7 @@ import org.junit.Assert.*
  * See [testing documentation](http://d.android.com/tools/testing).
  */
 class ExampleUnitTest {
-    /** Example test, not doing anything meanigful yet. */
+    /** Example test, not doing anything meaningful yet. */
     @Test
     fun addition_isCorrect() {
         assertEquals(4, 2 + 2)

build.gradle

@@ -2,7 +2,9 @@
 plugins {
     id 'com.android.application' version '8.1.3' apply false
     id 'com.android.library' version '8.1.3' apply false
+    id 'com.android.application' version '8.2.2' apply false
+    id 'com.android.library' version '8.2.2' apply false
     id 'com.github.ben-manes.versions' version '0.49.0'
     id 'org.jetbrains.dokka' version '1.9.10' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.20' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
 }