A fully functional Android app built entirely with Kotlin and Jetpack Compose
Migrate packages to namespaces in build files
Wojtek Kalicińskidcc23829d4cb
diff --git a/app-nia-catalog/build.gradle.kts b/app-nia-catalog/build.gradle.ktsindex 33ce4dc24..898a66906 100644--- a/app-nia-catalog/build.gradle.kts+++ b/app-nia-catalog/build.gradle.kts@@ -32,6 +32,7 @@ android {excludes.add("/META-INF/{AL2.0,LGPL2.1}")}}+ namespace = "com.google.samples.apps.niacatalog"}dependencies {diff --git a/app-nia-catalog/src/main/AndroidManifest.xml b/app-nia-catalog/src/main/AndroidManifest.xmlindex 0d74ce017..90341aac1 100644--- a/app-nia-catalog/src/main/AndroidManifest.xml+++ b/app-nia-catalog/src/main/AndroidManifest.xml@@ -14,8 +14,7 @@See the License for the specific language governing permissions andlimitations under the License.-->-<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.google.samples.apps.niacatalog">+<manifest xmlns:android="http://schemas.android.com/apk/res/android"><applicationandroid:allowBackup="true"diff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex f887e7f35..10bfe9c22 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -13,8 +13,6 @@* See the License for the specific language governing permissions and* limitations under the License.*/-import com.google.samples.apps.nowinandroid.Flavor-import com.google.samples.apps.nowinandroid.FlavorDimensionplugins {id("nowinandroid.android.application")@@ -75,6 +73,7 @@ android {isIncludeAndroidResources = true}}+ namespace = "com.google.samples.apps.nowinandroid"}dependencies {diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xmlindex 821bc605e..858ae9b19 100644--- a/app/src/main/AndroidManifest.xml+++ b/app/src/main/AndroidManifest.xml@@ -15,8 +15,7 @@limitations under the License.--><manifest xmlns:android="http://schemas.android.com/apk/res/android"- xmlns:tools="http://schemas.android.com/tools"- package="com.google.samples.apps.nowinandroid">+ xmlns:tools="http://schemas.android.com/tools"><uses-permission android:name="android.permission.INTERNET" />diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.ktsindex 42e9d8e12..491dffd80 100644--- a/core/common/build.gradle.kts+++ b/core/common/build.gradle.kts@@ -19,6 +19,10 @@ plugins {id("nowinandroid.android.hilt")}+android {+ namespace = "com.google.samples.apps.nowinandroid.core.common"+}+dependencies {implementation(libs.kotlinx.coroutines.android)testImplementation(project(":core:testing"))diff --git a/core/common/src/main/AndroidManifest.xml b/core/common/src/main/AndroidManifest.xmlindex a0b613a7b..ec921f928 100644--- a/core/common/src/main/AndroidManifest.xml+++ b/core/common/src/main/AndroidManifest.xml@@ -14,7 +14,6 @@See the License for the specific language governing permissions andlimitations under the License.-->-<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.google.samples.apps.nowinandroid.core.common">+<manifest xmlns:android="http://schemas.android.com/apk/res/android"></manifest>\ No newline at end of filediff --git a/core/data-test/build.gradle.kts b/core/data-test/build.gradle.ktsindex 5dacd8253..f50e7b4b8 100644--- a/core/data-test/build.gradle.kts+++ b/core/data-test/build.gradle.kts@@ -18,6 +18,10 @@ plugins {id("nowinandroid.android.hilt")}+android {+ namespace = "com.google.samples.apps.nowinandroid.core.data.test"+}+dependencies {api(project(":core:data"))implementation(project(":core:testing"))diff --git a/core/data-test/src/main/AndroidManifest.xml b/core/data-test/src/main/AndroidManifest.xmlindex 2ce7621ac..547d48054 100644--- a/core/data-test/src/main/AndroidManifest.xml+++ b/core/data-test/src/main/AndroidManifest.xml@@ -14,7 +14,6 @@See the License for the specific language governing permissions andlimitations under the License.-->-<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.google.samples.apps.nowinandroid.core.data.test">+<manifest xmlns:android="http://schemas.android.com/apk/res/android"></manifest>diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.ktsindex 750be3700..44a186647 100644--- a/core/data/build.gradle.kts+++ b/core/data/build.gradle.kts@@ -20,6 +20,10 @@ plugins {id("kotlinx-serialization")}+android {+ namespace = "com.google.samples.apps.nowinandroid.core.data"+}+dependencies {implementation(project(":core:common"))implementation(project(":core:model"))@@ -35,4 +39,4 @@ dependencies {implementation(libs.kotlinx.datetime)implementation(libs.kotlinx.coroutines.android)implementation(libs.kotlinx.serialization.json)-}+}\ No newline at end of filediff --git a/core/data/src/main/AndroidManifest.xml b/core/data/src/main/AndroidManifest.xmlindex ab11f61c4..a5c595622 100644--- a/core/data/src/main/AndroidManifest.xml+++ b/core/data/src/main/AndroidManifest.xml@@ -14,7 +14,6 @@See the License for the specific language governing permissions andlimitations under the License.-->-<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.google.samples.apps.nowinandroid.core.data">+<manifest xmlns:android="http://schemas.android.com/apk/res/android"><uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /></manifest>\ No newline at end of filediff --git a/core/database/build.gradle.kts b/core/database/build.gradle.ktsindex 6bcabe042..b0200b333 100644--- a/core/database/build.gradle.kts+++ b/core/database/build.gradle.kts@@ -33,6 +33,7 @@ android {testInstrumentationRunner = "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"}+ namespace = "com.google.samples.apps.nowinandroid.core.database"}dependencies {diff --git a/core/database/src/main/AndroidManifest.xml b/core/database/src/main/AndroidManifest.xmlindex ae6d3fe50..ec921f928 100644--- a/core/database/src/main/AndroidManifest.xml+++ b/core/database/src/main/AndroidManifest.xml@@ -14,7 +14,6 @@See the License for the specific language governing permissions andlimitations under the License.-->-<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.google.samples.apps.nowinandroid.core.database">+<manifest xmlns:android="http://schemas.android.com/apk/res/android"></manifest>\ No newline at end of filediff --git a/core/datastore-test/build.gradle.kts b/core/datastore-test/build.gradle.ktsindex 67c32cc45..40b287b7b 100644--- a/core/datastore-test/build.gradle.kts+++ b/core/datastore-test/build.gradle.kts@@ -18,6 +18,10 @@ plugins {id("nowinandroid.android.hilt")}+android {+ namespace = "com.google.samples.apps.nowinandroid.core.datastore.test"+}+dependencies {api(project(":core:datastore"))implementation(project(":core:testing"))diff --git a/core/datastore-test/src/main/AndroidManifest.xml b/core/datastore-test/src/main/AndroidManifest.xmlindex e0d63ea27..ec921f928 100644--- a/core/datastore-test/src/main/AndroidManifest.xml+++ b/core/datastore-test/src/main/AndroidManifest.xml@@ -14,7 +14,6 @@See the License for the specific language governing permissions andlimitations under the License.-->-<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.google.samples.apps.nowinandroid.core.datastore.test">+<manifest xmlns:android="http://schemas.android.com/apk/res/android"></manifest>\ No newline at end of filediff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.ktsindex 616256bf5..519ce49c3 100644--- a/core/datastore/build.gradle.kts+++ b/core/datastore/build.gradle.kts@@ -32,6 +32,7 @@ android {defaultConfig {consumerProguardFiles("consumer-proguard-rules.pro")}+ namespace = "com.google.samples.apps.nowinandroid.core.datastore"}// Setup protobuf configuration, generating lite Java and Kotlin classesdiff --git a/core/datastore/src/main/AndroidManifest.xml b/core/datastore/src/main/AndroidManifest.xmlindex d07c935fa..ec921f928 100644--- a/core/datastore/src/main/AndroidManifest.xml+++ b/core/datastore/src/main/AndroidManifest.xml@@ -14,7 +14,6 @@See the License for the specific language governing permissions andlimitations under the License.-->-<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.google.samples.apps.nowinandroid.core.datastore">+<manifest xmlns:android="http://schemas.android.com/apk/res/android"></manifest>\ No newline at end of filediff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.ktsindex 63c67e486..0b0db6155 100644--- a/core/designsystem/build.gradle.kts+++ b/core/designsystem/build.gradle.kts@@ -26,6 +26,7 @@ android {lint {checkDependencies = true}+ namespace = "com.google.samples.apps.nowinandroid.core.designsystem"}dependencies {diff --git a/core/designsystem/src/main/AndroidManifest.xml b/core/designsystem/src/main/AndroidManifest.xmlindex 0f6a479a3..ec921f928 100644--- a/core/designsystem/src/main/AndroidManifest.xml+++ b/core/designsystem/src/main/AndroidManifest.xml@@ -14,7 +14,6 @@See the License for the specific language governing permissions andlimitations under the License.-->-<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.google.samples.apps.nowinandroid.core.designsystem">+<manifest xmlns:android="http://schemas.android.com/apk/res/android"></manifest>\ No newline at end of filediff --git a/core/navigation/build.gradle.kts b/core/navigation/build.gradle.ktsindex 396f12b18..f762d5b7d 100644--- a/core/navigation/build.gradle.kts+++ b/core/navigation/build.gradle.kts@@ -21,6 +21,10 @@ plugins {id("nowinandroid.android.hilt")}+android {+ namespace = "com.google.samples.apps.nowinandroid.core.navigation"+}+dependencies {api(libs.androidx.hilt.navigation.compose)api(libs.androidx.navigation.compose)diff --git a/core/navigation/src/main/AndroidManifest.xml b/core/navigation/src/main/AndroidManifest.xmlindex 915676f9b..ec921f928 100644--- a/core/navigation/src/main/AndroidManifest.xml+++ b/core/navigation/src/main/AndroidManifest.xml@@ -14,7 +14,6 @@See the License for the specific language governing permissions andlimitations under the License.-->-<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.google.samples.apps.nowinandroid.core.navigation">+<manifest xmlns:android="http://schemas.android.com/apk/res/android"></manifest>\ No newline at end of filediff --git a/core/network/build.gradle.kts b/core/network/build.gradle.ktsindex ba3fc63ad..7ac3a7b8b 100644--- a/core/network/build.gradle.kts+++ b/core/network/build.gradle.kts@@ -26,6 +26,7 @@ android {buildFeatures {buildConfig = true}+ namespace = "com.google.samples.apps.nowinandroid.core.network"}secrets {diff --git a/core/network/src/main/AndroidManifest.xml b/core/network/src/main/AndroidManifest.xmlindex 0d9ff8a0f..0cb50fd30 100644--- a/core/network/src/main/AndroidManifest.xml+++ b/core/network/src/main/AndroidManifest.xml@@ -14,8 +14,7 @@See the License for the specific language governing permissions andlimitations under the License.-->-<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.google.samples.apps.nowinandroid.core.network">+<manifest xmlns:android="http://schemas.android.com/apk/res/android"><uses-permission android:name="android.permission.INTERNET" /></manifest>\ No newline at end of filediff --git a/core/testing/build.gradle.kts b/core/testing/build.gradle.ktsindex 0a8b77838..61bff3395 100644--- a/core/testing/build.gradle.kts+++ b/core/testing/build.gradle.kts@@ -18,6 +18,10 @@ plugins {id("nowinandroid.android.hilt")}+android {+ namespace = "com.google.samples.apps.nowinandroid.core.testing"+}+dependencies {implementation(project(":core:common"))implementation(project(":core:data"))diff --git a/core/testing/src/main/AndroidManifest.xml b/core/testing/src/main/AndroidManifest.xmlindex 42486709c..ec921f928 100644--- a/core/testing/src/main/AndroidManifest.xml+++ b/core/testing/src/main/AndroidManifest.xml@@ -14,7 +14,6 @@See the License for the specific language governing permissions andlimitations under the License.-->-<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.google.samples.apps.nowinandroid.core.testing">+<manifest xmlns:android="http://schemas.android.com/apk/res/android"></manifest>\ No newline at end of filediff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.ktsindex de5d1cf30..5aeab9b74 100644--- a/core/ui/build.gradle.kts+++ b/core/ui/build.gradle.kts@@ -19,6 +19,10 @@ plugins {id("nowinandroid.android.library.jacoco")}+android {+ namespace = "com.google.samples.apps.nowinandroid.core.ui"+}+dependencies {implementation(project(":core:designsystem"))implementation(project(":core:model"))diff --git a/core/ui/src/main/AndroidManifest.xml b/core/ui/src/main/AndroidManifest.xmlindex 864e3481d..ec921f928 100644--- a/core/ui/src/main/AndroidManifest.xml+++ b/core/ui/src/main/AndroidManifest.xml@@ -14,7 +14,6 @@See the License for the specific language governing permissions andlimitations under the License.-->-<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.google.samples.apps.nowinandroid.core.ui">+<manifest xmlns:android="http://schemas.android.com/apk/res/android"></manifest>\ No newline at end of filediff --git a/feature/author/build.gradle.kts b/feature/author/build.gradle.ktsindex 5c2cd37ed..cf52f1751 100644--- a/feature/author/build.gradle.kts+++ b/feature/author/build.gradle.kts@@ -19,6 +19,10 @@ plugins {id("nowinandroid.android.library.jacoco")}+android {+ namespace = "com.google.samples.apps.nowinandroid.feature.author"+}+dependencies {implementation(libs.kotlinx.datetime)}diff --git a/feature/author/src/main/AndroidManifest.xml b/feature/author/src/main/AndroidManifest.xmlindex bd1b40b71..547d48054 100644--- a/feature/author/src/main/AndroidManifest.xml+++ b/feature/author/src/main/AndroidManifest.xml@@ -14,7 +14,6 @@See the License for the specific language governing permissions andlimitations under the License.-->-<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.google.samples.apps.nowinandroid.feature.author">+<manifest xmlns:android="http://schemas.android.com/apk/res/android"></manifest>diff --git a/feature/bookmarks/build.gradle.kts b/feature/bookmarks/build.gradle.ktsindex a1c4a4260..9db302e99 100644--- a/feature/bookmarks/build.gradle.kts+++ b/feature/bookmarks/build.gradle.kts@@ -19,6 +19,10 @@ plugins {id("nowinandroid.android.library.jacoco")}+android {+ namespace = "com.google.samples.apps.nowinandroid.feature.bookmarks"+}+dependencies {implementation(libs.androidx.compose.material3.windowSizeClass)}\ No newline at end of filediff --git a/feature/bookmarks/src/main/AndroidManifest.xml b/feature/bookmarks/src/main/AndroidManifest.xmlindex a6641fae1..ec921f928 100644--- a/feature/bookmarks/src/main/AndroidManifest.xml+++ b/feature/bookmarks/src/main/AndroidManifest.xml@@ -14,7 +14,6 @@See the License for the specific language governing permissions andlimitations under the License.-->-<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.google.samples.apps.nowinandroid.feature.bookmarks">+<manifest xmlns:android="http://schemas.android.com/apk/res/android"></manifest>\ No newline at end of filediff --git a/feature/foryou/build.gradle.kts b/feature/foryou/build.gradle.ktsindex 37baf1049..ae2d380e6 100644--- a/feature/foryou/build.gradle.kts+++ b/feature/foryou/build.gradle.kts@@ -19,6 +19,10 @@ plugins {id("nowinandroid.android.library.jacoco")}+android {+ namespace = "com.google.samples.apps.nowinandroid.feature.foryou"+}+dependencies {implementation(libs.kotlinx.datetime)diff --git a/feature/foryou/src/main/AndroidManifest.xml b/feature/foryou/src/main/AndroidManifest.xmlindex f72fbc540..ec921f928 100644--- a/feature/foryou/src/main/AndroidManifest.xml+++ b/feature/foryou/src/main/AndroidManifest.xml@@ -14,7 +14,6 @@See the License for the specific language governing permissions andlimitations under the License.-->-<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.google.samples.apps.nowinandroid.feature.foryou">+<manifest xmlns:android="http://schemas.android.com/apk/res/android"></manifest>\ No newline at end of filediff --git a/feature/interests/build.gradle.kts b/feature/interests/build.gradle.ktsindex 335b2af9b..de3f7854b 100644--- a/feature/interests/build.gradle.kts+++ b/feature/interests/build.gradle.kts@@ -18,3 +18,6 @@ plugins {id("nowinandroid.android.library.compose")id("nowinandroid.android.library.jacoco")}+android {+ namespace = "com.google.samples.apps.nowinandroid.feature.interests"+}diff --git a/feature/interests/src/main/AndroidManifest.xml b/feature/interests/src/main/AndroidManifest.xmlindex 13505caf9..ec921f928 100644--- a/feature/interests/src/main/AndroidManifest.xml+++ b/feature/interests/src/main/AndroidManifest.xml@@ -14,7 +14,6 @@See the License for the specific language governing permissions andlimitations under the License.-->-<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.google.samples.apps.nowinandroid.feature.interests">+<manifest xmlns:android="http://schemas.android.com/apk/res/android"></manifest>\ No newline at end of filediff --git a/feature/topic/build.gradle.kts b/feature/topic/build.gradle.ktsindex 1fef08011..70c730dbd 100644--- a/feature/topic/build.gradle.kts+++ b/feature/topic/build.gradle.kts@@ -19,6 +19,10 @@ plugins {id("nowinandroid.android.library.jacoco")}+android {+ namespace = "com.google.samples.apps.nowinandroid.feature.topic"+}+dependencies {implementation(libs.kotlinx.datetime)}\ No newline at end of filediff --git a/feature/topic/src/main/AndroidManifest.xml b/feature/topic/src/main/AndroidManifest.xmlindex be0731035..547d48054 100644--- a/feature/topic/src/main/AndroidManifest.xml+++ b/feature/topic/src/main/AndroidManifest.xml@@ -14,7 +14,6 @@See the License for the specific language governing permissions andlimitations under the License.-->-<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.google.samples.apps.nowinandroid.feature.topic">+<manifest xmlns:android="http://schemas.android.com/apk/res/android"></manifest>diff --git a/sync/sync-test/build.gradle.kts b/sync/sync-test/build.gradle.ktsindex 4abdf001c..99909af6b 100644--- a/sync/sync-test/build.gradle.kts+++ b/sync/sync-test/build.gradle.kts@@ -18,6 +18,10 @@ plugins {id("nowinandroid.android.hilt")}+android {+ namespace = "com.google.samples.apps.nowinandroid.core.sync.test"+}+dependencies {api(project(":sync:work"))implementation(project(":core:data"))diff --git a/sync/sync-test/src/main/AndroidManifest.xml b/sync/sync-test/src/main/AndroidManifest.xmlindex 7550c99bb..547d48054 100644--- a/sync/sync-test/src/main/AndroidManifest.xml+++ b/sync/sync-test/src/main/AndroidManifest.xml@@ -14,7 +14,6 @@See the License for the specific language governing permissions andlimitations under the License.-->-<manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="com.google.samples.apps.nowinandroid.core.sync.test">+<manifest xmlns:android="http://schemas.android.com/apk/res/android"></manifest>diff --git a/sync/work/build.gradle.kts b/sync/work/build.gradle.ktsindex 2bf94d6c2..70f6b2e89 100644--- a/sync/work/build.gradle.kts+++ b/sync/work/build.gradle.kts@@ -23,6 +23,7 @@ android {defaultConfig {testInstrumentationRunner = "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"}+ namespace = "com.google.samples.apps.nowinandroid.sync"}dependencies {diff --git a/sync/work/src/main/AndroidManifest.xml b/sync/work/src/main/AndroidManifest.xmlindex b06d3c873..2487eb105 100644--- a/sync/work/src/main/AndroidManifest.xml+++ b/sync/work/src/main/AndroidManifest.xml@@ -15,8 +15,7 @@limitations under the License.--><manifest xmlns:android="http://schemas.android.com/apk/res/android"- xmlns:tools="http://schemas.android.com/tools"- package="com.google.samples.apps.nowinandroid.sync">+ xmlns:tools="http://schemas.android.com/tools"><application><provider