From 85328a462ea1ccded2b8929f047a8cc3e7552815 Mon Sep 17 00:00:00 2001 From: Osip Fatkullin Date: Fri, 17 May 2024 17:45:01 +0200 Subject: [PATCH] build: Android Gradle Plugin 8.4.0 --- gradle/libs.versions.toml | 4 ++-- ktx/core-ktx/build.gradle.kts | 4 ++++ ktx/core-ktx/src/main/AndroidManifest.xml | 1 - ktx/fragment-args-ktx/build.gradle.kts | 4 ++++ ktx/fragment-args-ktx/src/main/AndroidManifest.xml | 1 - ktx/fragment-ktx/build.gradle.kts | 4 ++++ ktx/fragment-ktx/src/main/AndroidManifest.xml | 1 - ktx/lifecycle-livedata-ktx/build.gradle.kts | 4 ++++ ktx/lifecycle-livedata-ktx/src/main/AndroidManifest.xml | 1 - ktx/resources-ktx/build.gradle.kts | 2 +- ktx/resources-ktx/src/main/AndroidManifest.xml | 1 - ktx/viewbinding-ktx/build.gradle.kts | 1 + ktx/viewbinding-ktx/src/main/AndroidManifest.xml | 1 - 13 files changed, 20 insertions(+), 9 deletions(-) delete mode 100644 ktx/core-ktx/src/main/AndroidManifest.xml delete mode 100644 ktx/fragment-args-ktx/src/main/AndroidManifest.xml delete mode 100644 ktx/fragment-ktx/src/main/AndroidManifest.xml delete mode 100644 ktx/lifecycle-livedata-ktx/src/main/AndroidManifest.xml delete mode 100644 ktx/resources-ktx/src/main/AndroidManifest.xml delete mode 100644 ktx/viewbinding-ktx/src/main/AndroidManifest.xml diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b65e4e1..b23be7a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -androidGradlePlugin = "7.4.2" +androidGradlePlugin = "8.4.0" assertj-core = "3.25.1" androidx-arch-core = "2.2.0" -viewbinding = "8.3.2" +viewbinding = "8.4.0" [libraries] androidx-viewbinding = { module = "androidx.databinding:viewbinding", version.ref = "viewbinding" } diff --git a/ktx/core-ktx/build.gradle.kts b/ktx/core-ktx/build.gradle.kts index a9202af..7c24023 100644 --- a/ktx/core-ktx/build.gradle.kts +++ b/ktx/core-ktx/build.gradle.kts @@ -5,6 +5,10 @@ plugins { version = "1.6.0-2" description = "Kotlin extensions in addition to androidx core-ktx" +android { + namespace = "$group.core" +} + dependencies { api(kotlin("stdlib")) api(androidx.core) diff --git a/ktx/core-ktx/src/main/AndroidManifest.xml b/ktx/core-ktx/src/main/AndroidManifest.xml deleted file mode 100644 index e23a623..0000000 --- a/ktx/core-ktx/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/ktx/fragment-args-ktx/build.gradle.kts b/ktx/fragment-args-ktx/build.gradle.kts index 8e6434f..81b29d7 100644 --- a/ktx/fragment-args-ktx/build.gradle.kts +++ b/ktx/fragment-args-ktx/build.gradle.kts @@ -5,6 +5,10 @@ plugins { version = "1.3.6-1" description = "Delegates for safe dealing with fragments' arguments" +android { + namespace = "$group.fragment.args" +} + dependencies { api(kotlin("stdlib")) api(androidx.fragment) diff --git a/ktx/fragment-args-ktx/src/main/AndroidManifest.xml b/ktx/fragment-args-ktx/src/main/AndroidManifest.xml deleted file mode 100644 index a98195a..0000000 --- a/ktx/fragment-args-ktx/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/ktx/fragment-ktx/build.gradle.kts b/ktx/fragment-ktx/build.gradle.kts index a180a27..659b6a6 100644 --- a/ktx/fragment-ktx/build.gradle.kts +++ b/ktx/fragment-ktx/build.gradle.kts @@ -5,6 +5,10 @@ plugins { version = "1.3.6-0" description = "A set of extensions in addition to androidx fragment-ktx" +android { + namespace = "$group.lifecycle.livedata" +} + dependencies { api(kotlin("stdlib")) api(androidx.fragment) diff --git a/ktx/fragment-ktx/src/main/AndroidManifest.xml b/ktx/fragment-ktx/src/main/AndroidManifest.xml deleted file mode 100644 index dc00170..0000000 --- a/ktx/fragment-ktx/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/ktx/lifecycle-livedata-ktx/build.gradle.kts b/ktx/lifecycle-livedata-ktx/build.gradle.kts index 5628930..75ddf13 100644 --- a/ktx/lifecycle-livedata-ktx/build.gradle.kts +++ b/ktx/lifecycle-livedata-ktx/build.gradle.kts @@ -5,6 +5,10 @@ plugins { version = "2.3.1-0" description = "Extended set of extensions for dealing with LiveData" +android { + namespace = "$group.lifecycle.livedata" +} + dependencies { api(kotlin("stdlib")) api(androidx.lifecycle.common) diff --git a/ktx/lifecycle-livedata-ktx/src/main/AndroidManifest.xml b/ktx/lifecycle-livedata-ktx/src/main/AndroidManifest.xml deleted file mode 100644 index 5da67ba..0000000 --- a/ktx/lifecycle-livedata-ktx/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/ktx/resources-ktx/build.gradle.kts b/ktx/resources-ktx/build.gradle.kts index 0cd8470..7d0bcfa 100644 --- a/ktx/resources-ktx/build.gradle.kts +++ b/ktx/resources-ktx/build.gradle.kts @@ -7,7 +7,7 @@ version = "1.3.1-0" description = "A set of Kotlin extensions for accessing resources" android { - namespace = "com.redmadrobot.extensions.resources-ktx" + namespace = "$group.resources" } dependencies { diff --git a/ktx/resources-ktx/src/main/AndroidManifest.xml b/ktx/resources-ktx/src/main/AndroidManifest.xml deleted file mode 100644 index 238a801..0000000 --- a/ktx/resources-ktx/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/ktx/viewbinding-ktx/build.gradle.kts b/ktx/viewbinding-ktx/build.gradle.kts index 1313438..c110657 100644 --- a/ktx/viewbinding-ktx/build.gradle.kts +++ b/ktx/viewbinding-ktx/build.gradle.kts @@ -6,6 +6,7 @@ version = "4.2.1-0" description = "A set of Kotlin extensions for dealing with ViewBinding" android { + namespace = "$group.viewbinding" defaultConfig.consumerProguardFile("viewbinding.pro") } diff --git a/ktx/viewbinding-ktx/src/main/AndroidManifest.xml b/ktx/viewbinding-ktx/src/main/AndroidManifest.xml deleted file mode 100644 index a5fa7a6..0000000 --- a/ktx/viewbinding-ktx/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ -