[#513] Apply some more new configration from Gradle 8

nimblehq · Aug 31, 2023 · 0892122 · 0892122
1 parent cf0814e
commit 0892122
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 11 deletions.
diff --git a/template-compose/app/build.gradle.kts b/template-compose/app/build.gradle.kts
@@ -47,7 +47,7 @@ android {
     }
 
     buildTypes {
-        getByName(BuildTypes.RELEASE) {
+        release {
             isMinifyEnabled = true
             isDebuggable = false
             isShrinkResources = true
@@ -56,7 +56,7 @@ android {
             buildConfigField("String", "BASE_API_URL", "\"https://jsonplaceholder.typicode.com/\"")
         }
 
-        getByName(BuildTypes.DEBUG) {
+        debug {
             // For quickly testing build with proguard, enable this
             isMinifyEnabled = false
             signingConfig = signingConfigs[BuildTypes.DEBUG]
@@ -86,12 +86,18 @@ android {
         jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
+    buildFeatures {
+        compose = true
+    }
+
     composeOptions {
         kotlinCompilerExtensionVersion = Versions.COMPOSE_COMPILER
     }
 
-    buildFeatures {
-        compose = true
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
     }
 
     lint {

diff --git a/template-compose/app/src/main/AndroidManifest.xml b/template-compose/app/src/main/AndroidManifest.xml
@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="co.nimblehq.template.compose">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:name=".MainApplication"
         android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:targetApi="31">
 
-        <activity android:name="co.nimblehq.template.compose.ui.screens.MainActivity" android:exported="true">
+        <activity
+            android:name=".ui.screens.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/template-compose/app/src/main/res/xml/backup_rules.xml b/template-compose/app/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample backup rules file; uncomment and customize as necessary.
+   See https://developer.android.com/guide/topics/data/autobackup
+   for details.
+   Note: This file is ignored for devices older that API 31
+   See https://developer.android.com/about/versions/12/backup-restore
+-->
+<full-backup-content>
+    <!--
+   <include domain="sharedpref" path="."/>
+   <exclude domain="sharedpref" path="device.xml"/>
+-->
+</full-backup-content>
diff --git a/template-compose/app/src/main/res/xml/data_extraction_rules.xml b/template-compose/app/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample data extraction rules file; uncomment and customize as necessary.
+   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
+   for details.
+-->
+<data-extraction-rules>
+    <cloud-backup>
+        <!-- TODO: Use <include> and <exclude> to control what is backed up.
+        <include .../>
+        <exclude .../>
+        -->
+    </cloud-backup>
+    <!--
+    <device-transfer>
+        <include .../>
+        <exclude .../>
+    </device-transfer>
+    -->
+</data-extraction-rules>
diff --git a/template-compose/data/build.gradle.kts b/template-compose/data/build.gradle.kts
@@ -10,20 +10,19 @@ android {
 
     defaultConfig {
         minSdk = Versions.ANDROID_MIN_SDK
-        targetSdk = Versions.ANDROID_TARGET_SDK
 
         consumerProguardFiles("consumer-rules.pro")
     }
 
     buildTypes {
-        getByName(BuildTypes.RELEASE) {
+        release {
             isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
             )
         }
 
-        getByName(BuildTypes.DEBUG) {
+        debug {
             isMinifyEnabled = false
         }
     }

diff --git a/template-compose/data/consumer-rules.pro b/template-compose/data/consumer-rules.pro
diff --git a/template-compose/data/src/main/AndroidManifest.xml b/template-compose/data/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="co.nimblehq.template.compose.data" />
+<manifest />