fixing errors

thomasthaddeus · Jan 22, 2024 · 5cc1eb6 · 5cc1eb6
1 parent 3ee754d
commit 5cc1eb6
Show file tree

Hide file tree

Showing 10 changed files with 77 additions and 18 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -4,15 +4,15 @@ plugins {
 }
 
 android {
-    namespace = "com.example.programmingtools"
+    namespace = "com.programmingtools.app"
     compileSdk = 34
 
     defaultConfig {
-        applicationId = "com.example.programmingtools"
+        applicationId = "com.programmingtools.app"
         minSdk = 29
         targetSdk = 34
         versionCode = 2
-        versionName = "1.0.1"
+        versionName = "1.0.2"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary = true
@@ -21,7 +21,7 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
@@ -47,12 +47,23 @@ android {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
+    dependenciesInfo {
+        includeInApk = true
+        includeInBundle = true
+    }
+    buildToolsVersion = "34.0.0"
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging = false
+        }
+    }
 }
 
 dependencies {
     implementation("androidx.core:core-ktx:1.12.0")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
-    implementation("androidx.activity:activity-compose:1.8.1")
+    implementation("androidx.startup:startup-runtime:1.1.0")
+    implementation("androidx.activity:activity-compose:1.8.2")
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")

diff --git a/app/release/app-release.aab b/app/release/app-release.aab
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -4,7 +4,7 @@
     "type": "APK",
     "kind": "Directory"
   },
-  "applicationId": "com.example.programmingtools",
+  "applicationId": "programmingtools",
   "variantName": "release",
   "elements": [
     {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,28 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.programmingtools.app"
+    android:versionCode="3"
+    android:versionName="1.0.2" >
+
+    <uses-sdk
+        android:targetSdkVersion="34"
+        android:minSdkVersion="29" />
+
+    <permission
+        android:name="com.programmingtools.app.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="com.programmingtools.app.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION" />
 
     <application
         android:allowBackup="true"
+        android:appComponentFactory="androidx.core.app.CoreComponentFactory"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.ProgrammingTools"
-        tools:targetApi="31">
+        android:theme="@style/Theme.ProgrammingTools" >
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.ProgrammingTools">
+            android:theme="@style/Theme.ProgrammingTools" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="com.programmingtools.app.androidx-startup"
+            android:exported="false"
+            tools:replace="android:authorities" >
+            <meta-data
+                android:name="androidx.emoji2.text.EmojiCompatInitializer"
+                android:value="androidx.startup" />
+            <meta-data
+                android:name="androidx.lifecycle.ProcessLifecycleInitializer"
+                android:value="androidx.startup" />
+            <meta-data
+                android:name="androidx.profileinstaller.ProfileInstallerInitializer"
+                android:value="androidx.startup" />
+        </provider>
+
+        <receiver
+            android:name="androidx.profileinstaller.ProfileInstallReceiver"
+            android:directBootAware="false"
+            android:enabled="true"
+            android:exported="true"
+            android:permission="android.permission.DUMP" >
+            <intent-filter>
+                <action android:name="androidx.profileinstaller.action.INSTALL_PROFILE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="androidx.profileinstaller.action.SKIP_FILE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="androidx.profileinstaller.action.SAVE_PROFILE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="androidx.profileinstaller.action.BENCHMARK_OPERATION" />
+            </intent-filter>
+        </receiver>
     </application>
 
 </manifest>
diff --git a/.../example/programmingtools/MainActivity.kt → ...n/java/programmingtools/MainActivityQR.kt b/.../example/programmingtools/MainActivity.kt → ...n/java/programmingtools/MainActivityQR.kt
@@ -1,4 +1,4 @@
-package com.example.programmingtools
+package com.programmingtools.app
 
 import android.graphics.Bitmap
 import android.graphics.Canvas

diff --git a/...xample/programmingtools/ui/theme/Color.kt → ...n/java/programmingtools/ui/theme/Color.kt b/...xample/programmingtools/ui/theme/Color.kt → ...n/java/programmingtools/ui/theme/Color.kt
@@ -1,4 +1,4 @@
-package com.example.programmingtools.ui.theme
+package programmingtools.ui.theme
 
 import androidx.compose.ui.graphics.Color
 

diff --git a/...xample/programmingtools/ui/theme/Theme.kt → ...n/java/programmingtools/ui/theme/Theme.kt b/...xample/programmingtools/ui/theme/Theme.kt → ...n/java/programmingtools/ui/theme/Theme.kt
@@ -1,4 +1,4 @@
-package com.example.programmingtools.ui.theme
+package programmingtools.ui.theme
 
 import android.app.Activity
 import android.os.Build

diff --git a/...example/programmingtools/ui/theme/Type.kt → ...in/java/programmingtools/ui/theme/Type.kt b/...example/programmingtools/ui/theme/Type.kt → ...in/java/programmingtools/ui/theme/Type.kt
@@ -1,4 +1,4 @@
-package com.example.programmingtools.ui.theme
+package programmingtools.ui.theme
 
 import androidx.compose.material3.Typography
 import androidx.compose.ui.text.TextStyle

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,6 +3,6 @@ buildscript {
 }
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.2.0" apply false
+    id("com.android.application") version "8.2.1" apply false
     id("org.jetbrains.kotlin.android") version "1.8.10" apply false
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
     }
 }
 dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    this.repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
         google()
         mavenCentral()