Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
6 changes: 3 additions & 3 deletions ImageHaramBlur/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -71,4 +71,4 @@ dependencies {
// Firebase ML Model downloader
implementation(libs.firebase.ml.modeldownloader)

}
}
23 changes: 12 additions & 11 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -43,8 +42,8 @@ android {
}

buildTypes {
debug {
}
debug {}

release {
isMinifyEnabled = AppConfig.ENABLE_R8_FULL_MODE
isShrinkResources = AppConfig.ENABLE_R8_FULL_MODE
Expand All @@ -62,19 +61,22 @@ android {
splits {
abi {
isEnable = true
isUniversalApk = true
exclude("mips", "mips64", "armeabi", "riscv64")
}
}

}
}

compileOptions {
sourceCompatibility = AppConfig.Version.JVM
targetCompatibility = AppConfig.Version.JVM
}

kotlinOptions {
jvmTarget = AppConfig.Version.JVM.toString()
}

buildFeatures {
compose = true
}
Expand All @@ -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)
Expand Down
15 changes: 8 additions & 7 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET" />

<application
android:allowBackup="true"
android:name="com.london.app.NovixApplication"
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
Expand All @@ -16,11 +18,8 @@

<activity
android:name="com.london.app.MainActivity"
android:screenOrientation="user"
android:exported="true"
android:label="@string/app_name"
android:theme="@style/Theme.Novix"
tools:ignore="DiscouragedApi">
android:theme="@style/Theme.Novix">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand All @@ -43,8 +42,10 @@
android:authorities="${applicationId}.androidx-startup"
android:exported="false"
tools:node="merge">
<meta-data android:name="androidx.work.WorkManagerInitializer" tools:node="remove" />
<meta-data
android:name="androidx.work.WorkManagerInitializer"
tools:node="remove" />
</provider>
</application>

</manifest>
</manifest>
17 changes: 0 additions & 17 deletions app/src/main/res/drawable/icon_remove.xml

This file was deleted.

14 changes: 0 additions & 14 deletions app/src/main/res/drawable/icon_save.xml

This file was deleted.

3 changes: 0 additions & 3 deletions app/src/main/res/image-add.svg

This file was deleted.

4 changes: 0 additions & 4 deletions app/src/main/res/values/strings.xml

This file was deleted.

6 changes: 2 additions & 4 deletions app/src/main/res/values/themes.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="Theme.Novix" parent="android:Theme.Material.Light.NoActionBar">
<item name="android:windowIsTranslucent">true</item>
</style>
</resources>
<style name="Theme.Novix" parent="android:Theme.Material.Light.NoActionBar" />
</resources>
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/com/london/buildsrc/AppConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 0 additions & 4 deletions data/src/main/AndroidManifest.xml

This file was deleted.

7 changes: 0 additions & 7 deletions designSystem/src/main/AndroidManifest.xml

This file was deleted.

6 changes: 0 additions & 6 deletions presentation/src/main/AndroidManifest.xml

This file was deleted.

Loading