update to support android 13

emoncms · Sep 19, 2023 · d8dc06d · d8dc06d
1 parent 1b2ef89
commit d8dc06d
Show file tree

Hide file tree

Showing 8 changed files with 294 additions and 214 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,16 +6,17 @@ android {
     defaultConfig {
         applicationId "org.emoncms.myapps"
         minSdkVersion 14
-        targetSdkVersion 26
-        versionCode 144
-        versionName "2.3.0"
+        targetSdkVersion 33
+        versionCode 145
+        versionName "2.3.1"
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'org.emoncms.myapps'
 }
 
 repositories {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="org.emoncms.myapps">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-feature android:name="android.hardware.camera" 
@@ -23,17 +22,26 @@
             android:value="barcode" />
 
         <activity
+            android:exported="true"
             android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".settings.SettingsActivity"/>
-        <activity android:name=".settings.AccountSettingsActivity"/>
-        <activity android:name=".MyElectricSettingsActivity"/>
-        <activity android:name=".barcodescanner.BarcodeCaptureActivity"/>
+        <activity
+            android:name=".settings.SettingsActivity"
+            android:exported="true"/>
+        <activity
+            android:name=".settings.AccountSettingsActivity"
+            android:exported="true"/>
+        <activity
+            android:name=".MyElectricSettingsActivity"
+            android:exported="true"/>
+        <activity
+            android:name=".barcodescanner.BarcodeCaptureActivity"
+            android:exported="true"/>
 
             <!--android:screenOrientation="landscape"-->
             <!--android:resizeableActivity="false"-->

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:8.1.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle.properties b/gradle.properties
@@ -16,4 +16,7 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 org.gradle.jvmargs=-Xmx2048M
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Aug 08 00:00:45 BST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip