From 2b549470c2d68d496c64a4d4d812894de3833150 Mon Sep 17 00:00:00 2001 From: razeeman Date: Sun, 11 Feb 2024 09:26:39 +0300 Subject: [PATCH] raise AGP to 8 --- app/build.gradle.kts | 17 ++++++++++++++++- app/src/main/AndroidManifest.xml | 3 +-- .../navigation/ScreenResolverImpl.kt | 1 + .../provider/ApplicationDataProviderImpl.kt | 7 ++++++- .../com/example/util/simpletimetracker/Base.kt | 3 +++ .../example/util/simpletimetracker/Versions.kt | 2 +- core/build.gradle.kts | 10 ++-------- core/src/main/AndroidManifest.xml | 3 +-- data_local/build.gradle.kts | 3 +++ data_local/src/main/AndroidManifest.xml | 2 +- features/feature_archive/build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 4 ++-- features/feature_base_adapter/build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 3 +-- features/feature_categories/build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 4 ++-- .../build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 4 ++-- .../feature_change_category/build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 4 ++-- features/feature_change_record/build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 4 ++-- .../feature_change_record_tag/build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 4 ++-- .../feature_change_record_type/build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 4 ++-- .../build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 4 ++-- features/feature_data_edit/build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 4 ++-- features/feature_dialogs/build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 4 ++-- features/feature_goals/build.gradle.kts | 5 +++++ .../feature_goals/src/main/AndroidManifest.xml | 4 ++-- features/feature_main/build.gradle.kts | 5 +++++ .../feature_main/src/main/AndroidManifest.xml | 4 ++-- features/feature_notification/build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 4 ++-- features/feature_records/build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 4 ++-- features/feature_records_all/build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 4 ++-- .../feature_records_filter/build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 4 ++-- .../feature_running_records/build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 2 +- features/feature_settings/build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 4 ++-- .../SettingsRatingViewDataInteractor.kt | 8 +------- features/feature_statistics/build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 4 ++-- .../feature_statistics_detail/build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 4 ++-- features/feature_tag_selection/build.gradle.kts | 5 +++++ .../src/main/AndroidManifest.xml | 4 ++-- features/feature_views/build.gradle.kts | 5 +++++ .../feature_views/src/main/AndroidManifest.xml | 3 +-- features/feature_widget/build.gradle.kts | 5 +++++ .../feature_widget/src/main/AndroidManifest.xml | 4 ++-- gradle.properties | 6 +++++- gradle/wrapper/gradle-wrapper.properties | 2 +- navigation/build.gradle.kts | 5 +++++ navigation/src/main/AndroidManifest.xml | 2 +- 63 files changed, 213 insertions(+), 73 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c7c37af2..166dcbbc 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,7 +13,7 @@ applyAndroidLibrary() android { defaultConfig { - applicationId = "com.razeeman.util.simpletimetracker" + applicationId = Base.applicationId versionCode = Base.versionCode versionName = Base.versionName @@ -41,11 +41,24 @@ android { } } + buildTypes { + getByName("debug") { + buildConfigField("String", "VERSION_NAME", "\"${defaultConfig.versionName}\"") + } + getByName("release") { + buildConfigField("String", "VERSION_NAME", "\"${defaultConfig.versionName}\"") + } + } + compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } + buildFeatures { + buildConfig = true + } + testOptions { animationsDisabled = true } @@ -54,6 +67,8 @@ android { // Adds exported schema location as test app assets. getByName("androidTest").assets.srcDir("$projectDir/../data_local/schemas") } + + namespace = Base.namespace } dependencies { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2b7f4d5a..1d64b6a0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> + diff --git a/data_local/build.gradle.kts b/data_local/build.gradle.kts index 84ea1f68..11038952 100644 --- a/data_local/build.gradle.kts +++ b/data_local/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -17,6 +18,8 @@ android { } } } + + namespace = "${Base.namespace}.data_local" } dependencies { diff --git a/data_local/src/main/AndroidManifest.xml b/data_local/src/main/AndroidManifest.xml index b1fcf984..cc947c56 100644 --- a/data_local/src/main/AndroidManifest.xml +++ b/data_local/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/features/feature_archive/build.gradle.kts b/features/feature_archive/build.gradle.kts index be3f43c3..0f2cc1cf 100644 --- a/features/feature_archive/build.gradle.kts +++ b/features/feature_archive/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_archive" +} + dependencies { implementation(project(":core")) implementation(Deps.Google.dagger) diff --git a/features/feature_archive/src/main/AndroidManifest.xml b/features/feature_archive/src/main/AndroidManifest.xml index 5338b647..96ce6cf5 100644 --- a/features/feature_archive/src/main/AndroidManifest.xml +++ b/features/feature_archive/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - + + \ No newline at end of file diff --git a/features/feature_base_adapter/build.gradle.kts b/features/feature_base_adapter/build.gradle.kts index b021a92e..840f69aa 100644 --- a/features/feature_base_adapter/build.gradle.kts +++ b/features/feature_base_adapter/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -9,6 +10,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_base_adapter" +} + dependencies { implementation(project(":feature_views")) implementation(project(":domain")) diff --git a/features/feature_base_adapter/src/main/AndroidManifest.xml b/features/feature_base_adapter/src/main/AndroidManifest.xml index afa30db5..96ce6cf5 100644 --- a/features/feature_base_adapter/src/main/AndroidManifest.xml +++ b/features/feature_base_adapter/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/features/feature_categories/build.gradle.kts b/features/feature_categories/build.gradle.kts index be3f43c3..c84024ea 100644 --- a/features/feature_categories/build.gradle.kts +++ b/features/feature_categories/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_categories" +} + dependencies { implementation(project(":core")) implementation(Deps.Google.dagger) diff --git a/features/feature_categories/src/main/AndroidManifest.xml b/features/feature_categories/src/main/AndroidManifest.xml index 1a427f1c..7726109e 100644 --- a/features/feature_categories/src/main/AndroidManifest.xml +++ b/features/feature_categories/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + + \ No newline at end of file diff --git a/features/feature_change_activity_filter/build.gradle.kts b/features/feature_change_activity_filter/build.gradle.kts index be3f43c3..7416d71a 100644 --- a/features/feature_change_activity_filter/build.gradle.kts +++ b/features/feature_change_activity_filter/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_change_activity_filter" +} + dependencies { implementation(project(":core")) implementation(Deps.Google.dagger) diff --git a/features/feature_change_activity_filter/src/main/AndroidManifest.xml b/features/feature_change_activity_filter/src/main/AndroidManifest.xml index 3b966c9f..7726109e 100644 --- a/features/feature_change_activity_filter/src/main/AndroidManifest.xml +++ b/features/feature_change_activity_filter/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + + \ No newline at end of file diff --git a/features/feature_change_category/build.gradle.kts b/features/feature_change_category/build.gradle.kts index 4243febb..c441ffde 100644 --- a/features/feature_change_category/build.gradle.kts +++ b/features/feature_change_category/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_change_category" +} + dependencies { implementation(project(":core")) implementation(project(":feature_change_record_type")) diff --git a/features/feature_change_category/src/main/AndroidManifest.xml b/features/feature_change_category/src/main/AndroidManifest.xml index f8698998..7726109e 100644 --- a/features/feature_change_category/src/main/AndroidManifest.xml +++ b/features/feature_change_category/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + + \ No newline at end of file diff --git a/features/feature_change_record/build.gradle.kts b/features/feature_change_record/build.gradle.kts index be3f43c3..b03e7b0d 100644 --- a/features/feature_change_record/build.gradle.kts +++ b/features/feature_change_record/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_change_record" +} + dependencies { implementation(project(":core")) implementation(Deps.Google.dagger) diff --git a/features/feature_change_record/src/main/AndroidManifest.xml b/features/feature_change_record/src/main/AndroidManifest.xml index 4d4dfd1f..c3b57bb4 100644 --- a/features/feature_change_record/src/main/AndroidManifest.xml +++ b/features/feature_change_record/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + + diff --git a/features/feature_change_record_tag/build.gradle.kts b/features/feature_change_record_tag/build.gradle.kts index be3f43c3..ea6d372b 100644 --- a/features/feature_change_record_tag/build.gradle.kts +++ b/features/feature_change_record_tag/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_change_record_tag" +} + dependencies { implementation(project(":core")) implementation(Deps.Google.dagger) diff --git a/features/feature_change_record_tag/src/main/AndroidManifest.xml b/features/feature_change_record_tag/src/main/AndroidManifest.xml index 06ba060e..96ce6cf5 100644 --- a/features/feature_change_record_tag/src/main/AndroidManifest.xml +++ b/features/feature_change_record_tag/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - + + \ No newline at end of file diff --git a/features/feature_change_record_type/build.gradle.kts b/features/feature_change_record_type/build.gradle.kts index be3f43c3..e691f180 100644 --- a/features/feature_change_record_type/build.gradle.kts +++ b/features/feature_change_record_type/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_change_record_type" +} + dependencies { implementation(project(":core")) implementation(Deps.Google.dagger) diff --git a/features/feature_change_record_type/src/main/AndroidManifest.xml b/features/feature_change_record_type/src/main/AndroidManifest.xml index 86d8139e..c3b57bb4 100644 --- a/features/feature_change_record_type/src/main/AndroidManifest.xml +++ b/features/feature_change_record_type/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + + diff --git a/features/feature_change_running_record/build.gradle.kts b/features/feature_change_running_record/build.gradle.kts index aefadf87..798d0f0b 100644 --- a/features/feature_change_running_record/build.gradle.kts +++ b/features/feature_change_running_record/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_change_running_record" +} + dependencies { implementation(project(":core")) implementation(project(":feature_change_record")) diff --git a/features/feature_change_running_record/src/main/AndroidManifest.xml b/features/feature_change_running_record/src/main/AndroidManifest.xml index a4bbd931..7726109e 100644 --- a/features/feature_change_running_record/src/main/AndroidManifest.xml +++ b/features/feature_change_running_record/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + + \ No newline at end of file diff --git a/features/feature_data_edit/build.gradle.kts b/features/feature_data_edit/build.gradle.kts index be3f43c3..7c066fc9 100644 --- a/features/feature_data_edit/build.gradle.kts +++ b/features/feature_data_edit/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_data_edit" +} + dependencies { implementation(project(":core")) implementation(Deps.Google.dagger) diff --git a/features/feature_data_edit/src/main/AndroidManifest.xml b/features/feature_data_edit/src/main/AndroidManifest.xml index 580b7e88..96ce6cf5 100644 --- a/features/feature_data_edit/src/main/AndroidManifest.xml +++ b/features/feature_data_edit/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - + + \ No newline at end of file diff --git a/features/feature_dialogs/build.gradle.kts b/features/feature_dialogs/build.gradle.kts index be3f43c3..80f2b111 100644 --- a/features/feature_dialogs/build.gradle.kts +++ b/features/feature_dialogs/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_dialogs" +} + dependencies { implementation(project(":core")) implementation(Deps.Google.dagger) diff --git a/features/feature_dialogs/src/main/AndroidManifest.xml b/features/feature_dialogs/src/main/AndroidManifest.xml index bff658e9..c3b57bb4 100644 --- a/features/feature_dialogs/src/main/AndroidManifest.xml +++ b/features/feature_dialogs/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + + diff --git a/features/feature_goals/build.gradle.kts b/features/feature_goals/build.gradle.kts index be3f43c3..2f486a43 100644 --- a/features/feature_goals/build.gradle.kts +++ b/features/feature_goals/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_goals" +} + dependencies { implementation(project(":core")) implementation(Deps.Google.dagger) diff --git a/features/feature_goals/src/main/AndroidManifest.xml b/features/feature_goals/src/main/AndroidManifest.xml index 2600b61d..c3b57bb4 100644 --- a/features/feature_goals/src/main/AndroidManifest.xml +++ b/features/feature_goals/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + + diff --git a/features/feature_main/build.gradle.kts b/features/feature_main/build.gradle.kts index 01efafd4..2e734213 100644 --- a/features/feature_main/build.gradle.kts +++ b/features/feature_main/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_main" +} + dependencies { implementation(project(":core")) implementation(project(":feature_running_records")) diff --git a/features/feature_main/src/main/AndroidManifest.xml b/features/feature_main/src/main/AndroidManifest.xml index 94e87df8..c3b57bb4 100644 --- a/features/feature_main/src/main/AndroidManifest.xml +++ b/features/feature_main/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + + diff --git a/features/feature_notification/build.gradle.kts b/features/feature_notification/build.gradle.kts index be3f43c3..ef2b732e 100644 --- a/features/feature_notification/build.gradle.kts +++ b/features/feature_notification/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_notification" +} + dependencies { implementation(project(":core")) implementation(Deps.Google.dagger) diff --git a/features/feature_notification/src/main/AndroidManifest.xml b/features/feature_notification/src/main/AndroidManifest.xml index 7777740b..ff95d597 100644 --- a/features/feature_notification/src/main/AndroidManifest.xml +++ b/features/feature_notification/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + @@ -28,4 +27,5 @@ + \ No newline at end of file diff --git a/features/feature_records/build.gradle.kts b/features/feature_records/build.gradle.kts index 140823bc..31d34e9a 100644 --- a/features/feature_records/build.gradle.kts +++ b/features/feature_records/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -11,6 +12,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_records" +} + dependencies { implementation(project(":core")) implementation(Deps.Google.dagger) diff --git a/features/feature_records/src/main/AndroidManifest.xml b/features/feature_records/src/main/AndroidManifest.xml index 0c61a7f3..c3b57bb4 100644 --- a/features/feature_records/src/main/AndroidManifest.xml +++ b/features/feature_records/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + + diff --git a/features/feature_records_all/build.gradle.kts b/features/feature_records_all/build.gradle.kts index be3f43c3..bff877c0 100644 --- a/features/feature_records_all/build.gradle.kts +++ b/features/feature_records_all/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_records_all" +} + dependencies { implementation(project(":core")) implementation(Deps.Google.dagger) diff --git a/features/feature_records_all/src/main/AndroidManifest.xml b/features/feature_records_all/src/main/AndroidManifest.xml index ba0a8a87..7726109e 100644 --- a/features/feature_records_all/src/main/AndroidManifest.xml +++ b/features/feature_records_all/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + + \ No newline at end of file diff --git a/features/feature_records_filter/build.gradle.kts b/features/feature_records_filter/build.gradle.kts index be3f43c3..6d143a5a 100644 --- a/features/feature_records_filter/build.gradle.kts +++ b/features/feature_records_filter/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_records_filter" +} + dependencies { implementation(project(":core")) implementation(Deps.Google.dagger) diff --git a/features/feature_records_filter/src/main/AndroidManifest.xml b/features/feature_records_filter/src/main/AndroidManifest.xml index ff83d87c..96ce6cf5 100644 --- a/features/feature_records_filter/src/main/AndroidManifest.xml +++ b/features/feature_records_filter/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - + + \ No newline at end of file diff --git a/features/feature_running_records/build.gradle.kts b/features/feature_running_records/build.gradle.kts index be3f43c3..b1c8c7b8 100644 --- a/features/feature_running_records/build.gradle.kts +++ b/features/feature_running_records/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_running_records" +} + dependencies { implementation(project(":core")) implementation(Deps.Google.dagger) diff --git a/features/feature_running_records/src/main/AndroidManifest.xml b/features/feature_running_records/src/main/AndroidManifest.xml index 8f9312fc..cc947c56 100644 --- a/features/feature_running_records/src/main/AndroidManifest.xml +++ b/features/feature_running_records/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/features/feature_settings/build.gradle.kts b/features/feature_settings/build.gradle.kts index be3f43c3..d4b6f8aa 100644 --- a/features/feature_settings/build.gradle.kts +++ b/features/feature_settings/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_settings" +} + dependencies { implementation(project(":core")) implementation(Deps.Google.dagger) diff --git a/features/feature_settings/src/main/AndroidManifest.xml b/features/feature_settings/src/main/AndroidManifest.xml index a6d0a21d..c3b57bb4 100644 --- a/features/feature_settings/src/main/AndroidManifest.xml +++ b/features/feature_settings/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + + diff --git a/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/interactor/SettingsRatingViewDataInteractor.kt b/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/interactor/SettingsRatingViewDataInteractor.kt index c2520b92..d50f48ae 100644 --- a/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/interactor/SettingsRatingViewDataInteractor.kt +++ b/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/interactor/SettingsRatingViewDataInteractor.kt @@ -1,6 +1,5 @@ package com.example.util.simpletimetracker.feature_settings.interactor -import com.example.util.simpletimetracker.core.BuildConfig import com.example.util.simpletimetracker.core.provider.ApplicationDataProvider import com.example.util.simpletimetracker.core.repo.ResourceRepo import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType @@ -51,11 +50,6 @@ class SettingsRatingViewDataInteractor @Inject constructor( } private fun loadVersionName(): String { - val appVersion = applicationDataProvider.getAppVersion() - return if (BuildConfig.DEBUG) { - "$appVersion ${BuildConfig.BUILD_TYPE}" - } else { - appVersion - } + return applicationDataProvider.getAppVersion() } } \ No newline at end of file diff --git a/features/feature_statistics/build.gradle.kts b/features/feature_statistics/build.gradle.kts index 140823bc..78b42206 100644 --- a/features/feature_statistics/build.gradle.kts +++ b/features/feature_statistics/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -11,6 +12,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_statistics" +} + dependencies { implementation(project(":core")) implementation(Deps.Google.dagger) diff --git a/features/feature_statistics/src/main/AndroidManifest.xml b/features/feature_statistics/src/main/AndroidManifest.xml index d31c0fae..c3b57bb4 100644 --- a/features/feature_statistics/src/main/AndroidManifest.xml +++ b/features/feature_statistics/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + + diff --git a/features/feature_statistics_detail/build.gradle.kts b/features/feature_statistics_detail/build.gradle.kts index 140823bc..4d4b6726 100644 --- a/features/feature_statistics_detail/build.gradle.kts +++ b/features/feature_statistics_detail/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -11,6 +12,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_statistics_detail" +} + dependencies { implementation(project(":core")) implementation(Deps.Google.dagger) diff --git a/features/feature_statistics_detail/src/main/AndroidManifest.xml b/features/feature_statistics_detail/src/main/AndroidManifest.xml index 1856bb2a..7726109e 100644 --- a/features/feature_statistics_detail/src/main/AndroidManifest.xml +++ b/features/feature_statistics_detail/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + + \ No newline at end of file diff --git a/features/feature_tag_selection/build.gradle.kts b/features/feature_tag_selection/build.gradle.kts index be3f43c3..9b2c38fa 100644 --- a/features/feature_tag_selection/build.gradle.kts +++ b/features/feature_tag_selection/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_tag_selection" +} + dependencies { implementation(project(":core")) implementation(Deps.Google.dagger) diff --git a/features/feature_tag_selection/src/main/AndroidManifest.xml b/features/feature_tag_selection/src/main/AndroidManifest.xml index 3e74b666..96ce6cf5 100644 --- a/features/feature_tag_selection/src/main/AndroidManifest.xml +++ b/features/feature_tag_selection/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - + + \ No newline at end of file diff --git a/features/feature_views/build.gradle.kts b/features/feature_views/build.gradle.kts index 08efe581..be44d61c 100644 --- a/features/feature_views/build.gradle.kts +++ b/features/feature_views/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_views" +} + dependencies { implementation(Deps.Androidx.appcompat) implementation(Deps.Androidx.recyclerView) diff --git a/features/feature_views/src/main/AndroidManifest.xml b/features/feature_views/src/main/AndroidManifest.xml index 92a54f5d..96ce6cf5 100644 --- a/features/feature_views/src/main/AndroidManifest.xml +++ b/features/feature_views/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/features/feature_widget/build.gradle.kts b/features/feature_widget/build.gradle.kts index 7113f1d9..274bbdf4 100644 --- a/features/feature_widget/build.gradle.kts +++ b/features/feature_widget/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.feature_widget" +} + dependencies { implementation(project(":core")) implementation(project(":feature_dialogs")) diff --git a/features/feature_widget/src/main/AndroidManifest.xml b/features/feature_widget/src/main/AndroidManifest.xml index 33b9b763..1596d075 100644 --- a/features/feature_widget/src/main/AndroidManifest.xml +++ b/features/feature_widget/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + @@ -88,4 +87,5 @@ + diff --git a/gradle.properties b/gradle.properties index c045df2f..e85f84b6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,8 +10,12 @@ # 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 -#Sat May 02 07:38:24 MSK 2020 kotlin.code.style=official android.enableJetifier=false org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M" android.useAndroidX=true + +# TODO With AGP version 8 these defaults to true +android.nonFinalResIds=false +android.nonTransitiveRClass=false +android.enableR8.fullMode=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e249ff2d..e2d0befe 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip diff --git a/navigation/build.gradle.kts b/navigation/build.gradle.kts index 06a1ae16..f0222bf9 100644 --- a/navigation/build.gradle.kts +++ b/navigation/build.gradle.kts @@ -1,3 +1,4 @@ +import com.example.util.simpletimetracker.Base import com.example.util.simpletimetracker.Deps import com.example.util.simpletimetracker.applyAndroidLibrary @@ -10,6 +11,10 @@ plugins { applyAndroidLibrary() +android { + namespace = "${Base.namespace}.navigation" +} + dependencies { implementation(project(":domain")) diff --git a/navigation/src/main/AndroidManifest.xml b/navigation/src/main/AndroidManifest.xml index bc496dbb..cc947c56 100644 --- a/navigation/src/main/AndroidManifest.xml +++ b/navigation/src/main/AndroidManifest.xml @@ -1 +1 @@ - + -- 2.51.2