1.1.4

Author: w2sv

Makefile

@@ -0,0 +1,7 @@
+SHELL=/bin/bash
+
+build-apk:
+	@./gradlew assembleRelease --console verbose
+
+build-aab:
+	@./gradlew :app:bundleRelease --console-verbose

app/build.gradle

@@ -6,27 +6,22 @@ plugins {
 }
 
 android {
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = '17'
-    }
     def PACKAGE_NAME = 'com.w2sv.wifiwidget'
 
     namespace PACKAGE_NAME
     compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
         applicationId PACKAGE_NAME
+
         minSdk libs.versions.minSdk.get().toInteger()
         targetSdk libs.versions.compileSdk.get().toInteger()
 
-        versionCode 7
-        versionName '1.1.3'
+        versionCode 8
+        versionName '1.1.4'
 
-//        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        setProperty('archivesBaseName', versionName)  // Stores built aab's as "{versionName}-{buildFlavor}.apk"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     signingConfigs {
         // create release signingConfig from keystore.properties file, if present
@@ -64,6 +59,19 @@ android {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = '17'
+    }
+    // Store built apks as "{versionName}.apk"
+    applicationVariants.all { variant ->
+        variant.outputs.all {
+            outputFileName = "${variant.versionName}.apk"
+        }
+    }
 }
 
 dependencies {

gradle.properties

@@ -13,4 +13,4 @@ android.useAndroidX=true
 android.nonTransitiveRClass=true
 android.defaults.buildfeatures.buildconfig=true
 android.uniquePackageNames=true
-#android.nonFinalResIds=false
+android.nonFinalResIds=false