diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 631fa63c9..685a3407a 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -107,7 +107,7 @@ jobs:
appId: ${{ secrets.FIREBASE_APP_ID }}
serviceCredentialsFileContent: ${{ secrets.ACCOUNT_SERVICE_JSON }}
groups: testers
- file: apks/app-${{ matrix.abi }}-release.apk
+ file: apks/Novix-${{ needs.build.outputs.version_name }}-${{ matrix.abi }}-release.apk
releaseNotes: |
📦 Split APK Build
🔧 ABI: ${{ matrix.abi }}
diff --git a/ImageHaramBlur/build.gradle.kts b/ImageHaramBlur/build.gradle.kts
index 9a83cd5b6..2b8a167c4 100644
--- a/ImageHaramBlur/build.gradle.kts
+++ b/ImageHaramBlur/build.gradle.kts
@@ -8,10 +8,10 @@ plugins {
android {
namespace = "com.london.imageharamblur"
- compileSdk = 35
+ compileSdk = AppConfig.Version.COMPILE_SDK
defaultConfig {
- minSdk = 26
+ minSdk = AppConfig.Version.MIN_SDK
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
@@ -71,4 +71,4 @@ dependencies {
// Firebase ML Model downloader
implementation(libs.firebase.ml.modeldownloader)
-}
\ No newline at end of file
+}
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 40ed56b10..06fc853a3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -16,21 +16,20 @@ plugins {
android {
namespace = AppConfig.APPLICATION_ID
- compileSdk = 36
+ compileSdk = AppConfig.Version.COMPILE_SDK
defaultConfig {
applicationId = AppConfig.APPLICATION_ID
minSdk = AppConfig.Version.MIN_SDK
targetSdk = AppConfig.Version.TARGET_SDK
-
// Allows for setting the version code via a Gradle property for CD pipeline.
versionCode = (project.findProperty("versionCode") as? String)?.toInt() ?: 1
versionName = project.findProperty("versionName") as? String ?: "1.0"
- testInstrumentationRunner = AppConfig.ANDROID_TEST_INSTRUMENTATION
-
+ base.archivesName = "Novix-${versionName}"
+ testInstrumentationRunner = AppConfig.ANDROID_TEST_INSTRUMENTATION
}
signingConfigs {
@@ -43,8 +42,8 @@ android {
}
buildTypes {
- debug {
- }
+ debug {}
+
release {
isMinifyEnabled = AppConfig.ENABLE_R8_FULL_MODE
isShrinkResources = AppConfig.ENABLE_R8_FULL_MODE
@@ -62,9 +61,10 @@ android {
splits {
abi {
isEnable = true
+ isUniversalApk = true
+ exclude("mips", "mips64", "armeabi", "riscv64")
}
}
-
}
}
@@ -72,9 +72,11 @@ android {
sourceCompatibility = AppConfig.Version.JVM
targetCompatibility = AppConfig.Version.JVM
}
+
kotlinOptions {
jvmTarget = AppConfig.Version.JVM.toString()
}
+
buildFeatures {
compose = true
}
@@ -101,12 +103,11 @@ dependencies {
ksp(libs.bundles.room.ksp)
implementation(libs.timber)
- implementation(libs.androidx.hilt.work)
- implementation(libs.androidx.work.runtime.ktx)
- implementation(libs.androidx.hilt.common)
-
ksp(libs.bundles.hilt.ksp)
+ implementation(libs.androidx.hilt.common)
implementation(libs.bundles.hilt.runtime)
+ implementation(libs.androidx.hilt.work)
+ implementation(libs.androidx.work.runtime.ktx)
implementation(libs.bundles.retrofit)
implementation(libs.retrofit2.kotlinx.serialization.converter)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 144ef4618..c975b846c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,9 +2,11 @@
+
+
+ android:theme="@style/Theme.Novix">
@@ -43,8 +42,10 @@
android:authorities="${applicationId}.androidx-startup"
android:exported="false"
tools:node="merge">
-
+
-
\ No newline at end of file
+
diff --git a/app/src/main/res/drawable/icon_remove.xml b/app/src/main/res/drawable/icon_remove.xml
deleted file mode 100644
index 13e1a47a0..000000000
--- a/app/src/main/res/drawable/icon_remove.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/icon_save.xml b/app/src/main/res/drawable/icon_save.xml
deleted file mode 100644
index 94b5a1002..000000000
--- a/app/src/main/res/drawable/icon_save.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/image-add.svg b/app/src/main/res/image-add.svg
deleted file mode 100644
index 112e149b0..000000000
--- a/app/src/main/res/image-add.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
deleted file mode 100644
index b2a35a385..000000000
--- a/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- Novix
-
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0198c1ba9..7c71b890f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,7 +1,5 @@
-
-
\ No newline at end of file
+
+
diff --git a/buildSrc/src/main/kotlin/com/london/buildsrc/AppConfig.kt b/buildSrc/src/main/kotlin/com/london/buildsrc/AppConfig.kt
index c06c09b2c..ec46d4358 100644
--- a/buildSrc/src/main/kotlin/com/london/buildsrc/AppConfig.kt
+++ b/buildSrc/src/main/kotlin/com/london/buildsrc/AppConfig.kt
@@ -8,8 +8,8 @@ object AppConfig {
object Version {
const val MIN_SDK = 26
- const val TARGET_SDK = 34
- const val COMPILE_SDK = 35
+ const val TARGET_SDK = 36
+ const val COMPILE_SDK = 36
val JVM = JavaVersion.VERSION_17
const val BUILD_TOOLS = "35.0.0"
}
diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml
deleted file mode 100644
index a5918e68a..000000000
--- a/data/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/designSystem/src/main/AndroidManifest.xml b/designSystem/src/main/AndroidManifest.xml
deleted file mode 100644
index 876dc6c4e..000000000
--- a/designSystem/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
deleted file mode 100644
index 16b8f6e0a..000000000
--- a/presentation/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file