Minor updates

.github/workflows/main.yml

@@ -14,10 +14,11 @@ jobs:
     - name: checkout
       uses: actions/checkout@v2
 
-    - name: set up JDK 1.11
-      uses: actions/setup-java@v1
+    - name: set up JDK 17
+      uses: actions/setup-java@v3
       with:
-        java-version: 1.11
+        distribution: 'temurin'
+        java-version: '17'
 
     - name: Install NDK
       run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.3.6528147" --sdk_root=${ANDROID_SDK_ROOT}

.gitignore

@@ -51,4 +51,5 @@ authorizer/debug/
 authorizer/release/
 authorizer/.externalNativeBuild/
 .cxx
-sign/
+sign/**
+!sign/sign.example.gradle

authorizer/build.gradle

@@ -15,7 +15,7 @@ android {
     defaultConfig {
         applicationId 'net.tjado.passwdsafe'
         minSdkVersion 21
-        resConfigs 'de'
+        resourceConfigurations += ['de']
         targetSdkVersion 33
         versionCode 401
         versionName '0.4.1'

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle.properties

@@ -20,7 +20,7 @@
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 
 # suppress inspection "UnusedProperty"
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
@@ -31,3 +31,6 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
 android.useAndroidX=true
 android.enableJetifier=true
 org.gradle.unsafe.configuration-cache=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Feb 02 11:04:32 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

sign/sign.example.gradle

@@ -0,0 +1,19 @@
+def keystoreFile = file("../sign/keystore.jks")
+if (!keystoreFile.exists()) throw new IllegalStateException("sign/keystore.jks file missing")
+
+android.signingConfigs.create("debug1", {
+    storeFile keystoreFile
+    storePassword 'storePassword'
+    keyAlias 'keyAlias'
+    keyPassword 'keyPassword'
+})
+
+android.signingConfigs.create("release1", {
+    storeFile keystoreFile
+    storePassword 'storePassword'
+    keyAlias 'keyAlias'
+    keyPassword 'keyPassword'
+})
+
+android.buildTypes["debug"].signingConfig = android.signingConfigs["debug1"]
+android.buildTypes["release"].signingConfig = android.signingConfigs["release1"]