diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts index 532f3fe6..e06430a2 100644 --- a/bom/build.gradle.kts +++ b/bom/build.gradle.kts @@ -1,29 +1,32 @@ import com.raxdenstudios.publishing.model.Coordinates +import com.raxdenstudios.publishing.model.Developer plugins { + `java-platform` alias(libs.plugins.android.versioning) - alias(libs.plugins.android.library.conventions) - alias(libs.plugins.android.publish.library) -} - -android { - namespace = "com.raxdenstudios.commons.bom" + alias(libs.plugins.publish.platform) } versioning { filePath = "version.properties" } -publishLibrary { - name = "Android" - description = "Android library" +publishPlatform { + name = "Android Commons BOM" + description = "Bill of Materials for Android Commons libraries" url = "https://github.com/raxden/android-commons" - developerId = "raxden" - developerName = "Ángel Gómez" - developerEmail = "raxden.dev@gmail.com" + developer = Developer( + id = "raxden", + name = "Ángel Gómez", + email = "raxden.dev@gmail.com", + ) coordinates = Coordinates.default.copy(artifactId = "commons-bom") } +javaPlatform { + allowDependencies() +} + dependencies { // If anyone use these dependencies, then are added constraints { diff --git a/bom/src/main/AndroidManifest.xml b/bom/src/main/AndroidManifest.xml deleted file mode 100644 index 8072ee00..00000000 --- a/bom/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/build-logic/gradle/libraries.versions.toml b/build-logic/gradle/libraries.versions.toml index e3cd35ae..5e0e47aa 100644 --- a/build-logic/gradle/libraries.versions.toml +++ b/build-logic/gradle/libraries.versions.toml @@ -125,8 +125,9 @@ timber-test = "1.0.1" # ------------------------------------------------------------------- # Your artifacts # ------------------------------------------------------------------- -android-versioning = "0.57.19" -android-publish-library = "0.57.19" +android-versioning = "0.57.22" +android-publish-library = "0.57.22" +publish-platform = "0.57.22" commons-android = "5.0.26" commons-android-binding = "1.0.10" @@ -373,6 +374,7 @@ test-logger = { id = "com.adarshr.test-logger", version.ref = "test-logger" } # ------------------------------------------------------------------- android-versioning = { id = "com.raxdenstudios.android-versioning", version.ref = "android-versioning" } android-publish-library = { id = "com.raxdenstudios.android-publish-library", version.ref = "android-publish-library" } +publish-platform = { id = "com.raxdenstudios.publish-platform", version.ref = "publish-platform" } nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" } nmcp = { id = "com.gradleup.nmcp", version.ref = "nmcp" } diff --git a/build.gradle.kts b/build.gradle.kts index 1387d91c..cc82b45b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,6 +11,7 @@ plugins { alias(libs.plugins.android.library) apply false alias(libs.plugins.android.versioning) apply false alias(libs.plugins.android.publish.library) apply false + alias(libs.plugins.publish.platform) apply false alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.ksp) apply false alias(libs.plugins.test.logger) diff --git a/gradle/libraries.versions.toml b/gradle/libraries.versions.toml index e3cd35ae..e56096cb 100644 --- a/gradle/libraries.versions.toml +++ b/gradle/libraries.versions.toml @@ -125,8 +125,9 @@ timber-test = "1.0.1" # ------------------------------------------------------------------- # Your artifacts # ------------------------------------------------------------------- -android-versioning = "0.57.19" -android-publish-library = "0.57.19" +android-versioning = "0.57.29" +android-publish-library = "0.57.29" +publish-platform = "0.57.29" commons-android = "5.0.26" commons-android-binding = "1.0.10" @@ -373,6 +374,7 @@ test-logger = { id = "com.adarshr.test-logger", version.ref = "test-logger" } # ------------------------------------------------------------------- android-versioning = { id = "com.raxdenstudios.android-versioning", version.ref = "android-versioning" } android-publish-library = { id = "com.raxdenstudios.android-publish-library", version.ref = "android-publish-library" } +publish-platform = { id = "com.raxdenstudios.publish-platform", version.ref = "publish-platform" } nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" } nmcp = { id = "com.gradleup.nmcp", version.ref = "nmcp" } diff --git a/libraries/android-binding/build.gradle.kts b/libraries/android-binding/build.gradle.kts index 449d7d73..82642a4f 100644 --- a/libraries/android-binding/build.gradle.kts +++ b/libraries/android-binding/build.gradle.kts @@ -1,4 +1,5 @@ import com.raxdenstudios.publishing.model.Coordinates +import com.raxdenstudios.publishing.model.Developer plugins { alias(libs.plugins.android.versioning) @@ -19,9 +20,11 @@ publishLibrary { name = "Android" description = "Android library" url = "https://github.com/raxden/android-commons" - developerId = "raxden" - developerName = "Ángel Gómez" - developerEmail = "raxden.dev@gmail.com" + developer = Developer( + id = "raxden", + name = "Ángel Gómez", + email = "raxden.dev@gmail.com", + ) coordinates = Coordinates.default.copy(artifactId = "commons-android-binding") } diff --git a/libraries/android-compose/build.gradle.kts b/libraries/android-compose/build.gradle.kts index d0d70a2d..6aee83e5 100644 --- a/libraries/android-compose/build.gradle.kts +++ b/libraries/android-compose/build.gradle.kts @@ -1,4 +1,5 @@ import com.raxdenstudios.publishing.model.Coordinates +import com.raxdenstudios.publishing.model.Developer plugins { alias(libs.plugins.android.versioning) @@ -18,9 +19,11 @@ publishLibrary { name = "Android Compose" description = "Android compose library" url = "https://github.com/raxden/android-commons" - developerId = "raxden" - developerName = "Ángel Gómez" - developerEmail = "raxden.dev@gmail.com" + developer = Developer( + id = "raxden", + name = "Ángel Gómez", + email = "raxden.dev@gmail.com", + ) coordinates = Coordinates.default.copy(artifactId = "commons-android-compose") } diff --git a/libraries/android-test/build.gradle.kts b/libraries/android-test/build.gradle.kts index 402b5270..93bac688 100644 --- a/libraries/android-test/build.gradle.kts +++ b/libraries/android-test/build.gradle.kts @@ -1,4 +1,5 @@ import com.raxdenstudios.publishing.model.Coordinates +import com.raxdenstudios.publishing.model.Developer plugins { alias(libs.plugins.android.versioning) @@ -18,9 +19,11 @@ publishLibrary { name = "Android test" description = "Android Test library" url = "https://github.com/raxden/android-commons" - developerId = "raxden" - developerName = "Ángel Gómez" - developerEmail = "raxden.dev@gmail.com" + developer = Developer( + id = "raxden", + name = "Ángel Gómez", + email = "raxden.dev@gmail.com", + ) coordinates = Coordinates.default.copy(artifactId = "commons-android-test") } diff --git a/libraries/android/build.gradle.kts b/libraries/android/build.gradle.kts index edcb7d7b..9b550925 100644 --- a/libraries/android/build.gradle.kts +++ b/libraries/android/build.gradle.kts @@ -1,4 +1,6 @@ + import com.raxdenstudios.publishing.model.Coordinates +import com.raxdenstudios.publishing.model.Developer plugins { alias(libs.plugins.android.versioning) @@ -18,9 +20,11 @@ publishLibrary { name = "Android" description = "Android library" url = "https://github.com/raxden/android-commons" - developerId = "raxden" - developerName = "Ángel Gómez" - developerEmail = "raxden.dev@gmail.com" + developer = Developer( + id = "raxden", + name = "Ángel Gómez", + email = "raxden.dev@gmail.com", + ) coordinates = Coordinates.default.copy(artifactId = "commons-android") } diff --git a/libraries/core/build.gradle.kts b/libraries/core/build.gradle.kts index a835920d..59ede4aa 100644 --- a/libraries/core/build.gradle.kts +++ b/libraries/core/build.gradle.kts @@ -1,4 +1,5 @@ import com.raxdenstudios.publishing.model.Coordinates +import com.raxdenstudios.publishing.model.Developer plugins { alias(libs.plugins.android.versioning) @@ -18,9 +19,11 @@ publishLibrary { name = "Android" description = "Android Core" url = "https://github.com/raxden/android-commons" - developerId = "raxden" - developerName = "Ángel Gómez" - developerEmail = "raxden.dev@gmail.com" + developer = Developer( + id = "raxden", + name = "Ángel Gómez", + email = "raxden.dev@gmail.com", + ) coordinates = Coordinates.default.copy(artifactId = "commons-core") } diff --git a/libraries/coroutines-test/build.gradle.kts b/libraries/coroutines-test/build.gradle.kts index 3aa7ee6a..537ece46 100644 --- a/libraries/coroutines-test/build.gradle.kts +++ b/libraries/coroutines-test/build.gradle.kts @@ -1,4 +1,5 @@ import com.raxdenstudios.publishing.model.Coordinates +import com.raxdenstudios.publishing.model.Developer plugins { alias(libs.plugins.android.versioning) @@ -18,9 +19,11 @@ publishLibrary { name = "Coroutines" description = "Coroutines library" url = "https://github.com/raxden/android-commons" - developerId = "raxden" - developerName = "Ángel Gómez" - developerEmail = "raxden.dev@gmail.com" + developer = Developer( + id = "raxden", + name = "Ángel Gómez", + email = "raxden.dev@gmail.com", + ) coordinates = Coordinates.default.copy(artifactId = "commons-coroutines-test") } diff --git a/libraries/coroutines/build.gradle.kts b/libraries/coroutines/build.gradle.kts index 9c0e58f0..3c9dc452 100644 --- a/libraries/coroutines/build.gradle.kts +++ b/libraries/coroutines/build.gradle.kts @@ -1,4 +1,5 @@ import com.raxdenstudios.publishing.model.Coordinates +import com.raxdenstudios.publishing.model.Developer plugins { alias(libs.plugins.android.versioning) @@ -18,9 +19,11 @@ publishLibrary { name = "Coroutines" description = "Coroutines library" url = "https://github.com/raxden/android-commons" - developerId = "raxden" - developerName = "Ángel Gómez" - developerEmail = "raxden.dev@gmail.com" + developer = Developer( + id = "raxden", + name = "Ángel Gómez", + email = "raxden.dev@gmail.com", + ) coordinates = Coordinates.default.copy(artifactId = "commons-coroutines") } diff --git a/libraries/network/build.gradle.kts b/libraries/network/build.gradle.kts index 1918779b..e5b52437 100644 --- a/libraries/network/build.gradle.kts +++ b/libraries/network/build.gradle.kts @@ -1,4 +1,5 @@ import com.raxdenstudios.publishing.model.Coordinates +import com.raxdenstudios.publishing.model.Developer plugins { alias(libs.plugins.android.versioning) @@ -18,9 +19,11 @@ publishLibrary { name = "Network" description = "Network library" url = "https://github.com/raxden/android-commons" - developerId = "raxden" - developerName = "Ángel Gómez" - developerEmail = "raxden.dev@gmail.com" + developer = Developer( + id = "raxden", + name = "Ángel Gómez", + email = "raxden.dev@gmail.com", + ) coordinates = Coordinates.default.copy(artifactId = "commons-network") } diff --git a/libraries/pagination-co/build.gradle.kts b/libraries/pagination-co/build.gradle.kts index b8dbaf86..6f29820a 100644 --- a/libraries/pagination-co/build.gradle.kts +++ b/libraries/pagination-co/build.gradle.kts @@ -1,4 +1,5 @@ import com.raxdenstudios.publishing.model.Coordinates +import com.raxdenstudios.publishing.model.Developer plugins { alias(libs.plugins.android.versioning) @@ -18,9 +19,11 @@ publishLibrary { name = "Pagination" description = "Pagination library" url = "https://github.com/raxden/android-commons" - developerId = "raxden" - developerName = "Ángel Gómez" - developerEmail = "raxden.dev@gmail.com" + developer = Developer( + id = "raxden", + name = "Ángel Gómez", + email = "raxden.dev@gmail.com", + ) coordinates = Coordinates.default.copy(artifactId = "commons-pagination-co") } diff --git a/libraries/pagination/build.gradle.kts b/libraries/pagination/build.gradle.kts index a8c6f5ae..5cf0a64c 100644 --- a/libraries/pagination/build.gradle.kts +++ b/libraries/pagination/build.gradle.kts @@ -1,4 +1,5 @@ import com.raxdenstudios.publishing.model.Coordinates +import com.raxdenstudios.publishing.model.Developer plugins { alias(libs.plugins.android.versioning) @@ -18,9 +19,11 @@ publishLibrary { name = "Pagination" description = "Pagination library" url = "https://github.com/raxden/android-commons" - developerId = "raxden" - developerName = "Ángel Gómez" - developerEmail = "raxden.dev@gmail.com" + developer = Developer( + id = "raxden", + name = "Ángel Gómez", + email = "raxden.dev@gmail.com", + ) coordinates = Coordinates.default.copy(artifactId = "commons-pagination") } diff --git a/libraries/permissions/build.gradle.kts b/libraries/permissions/build.gradle.kts index ca1daa78..107c4277 100644 --- a/libraries/permissions/build.gradle.kts +++ b/libraries/permissions/build.gradle.kts @@ -1,4 +1,5 @@ import com.raxdenstudios.publishing.model.Coordinates +import com.raxdenstudios.publishing.model.Developer plugins { alias(libs.plugins.android.versioning) @@ -19,9 +20,11 @@ publishLibrary { description = "Permissions commons is a library with a set of useful classes to help to " + "developer to work with permissions." url = "https://github.com/raxden/android-commons" - developerId = "raxden" - developerName = "Ángel Gómez" - developerEmail = "raxden.dev@gmail.com" + developer = Developer( + id = "raxden", + name = "Ángel Gómez", + email = "raxden.dev@gmail.com", + ) coordinates = Coordinates.default.copy(artifactId = "commons-permissions") } diff --git a/libraries/preferences/build.gradle.kts b/libraries/preferences/build.gradle.kts index 2613b7bd..4c2f2e3c 100644 --- a/libraries/preferences/build.gradle.kts +++ b/libraries/preferences/build.gradle.kts @@ -1,4 +1,5 @@ import com.raxdenstudios.publishing.model.Coordinates +import com.raxdenstudios.publishing.model.Developer plugins { alias(libs.plugins.android.versioning) @@ -19,9 +20,11 @@ publishLibrary { description = "Preferences commons is a library with a set of useful classes to help to " + "developer to work with preferences." url = "https://github.com/raxden/android-commons" - developerId = "raxden" - developerName = "Ángel Gómez" - developerEmail = "raxden.dev@gmail.com" + developer = Developer( + id = "raxden", + name = "Ángel Gómez", + email = "raxden.dev@gmail.com", + ) coordinates = Coordinates.default.copy(artifactId = "commons-preferences") } diff --git a/libraries/threeten-test/build.gradle.kts b/libraries/threeten-test/build.gradle.kts index 39ae2c47..a533517b 100644 --- a/libraries/threeten-test/build.gradle.kts +++ b/libraries/threeten-test/build.gradle.kts @@ -1,4 +1,5 @@ import com.raxdenstudios.publishing.model.Coordinates +import com.raxdenstudios.publishing.model.Developer plugins { alias(libs.plugins.android.versioning) @@ -19,9 +20,11 @@ publishLibrary { description = "Threeten test commons is a library with a set of useful classes to help to " + "developer to work with threeten." url = "https://github.com/raxden/android-commons" - developerId = "raxden" - developerName = "Ángel Gómez" - developerEmail = "raxden.dev@gmail.com" + developer = Developer( + id = "raxden", + name = "Ángel Gómez", + email = "raxden.dev@gmail.com", + ) coordinates = Coordinates.default.copy(artifactId = "commons-threeten-test") } diff --git a/libraries/threeten/build.gradle.kts b/libraries/threeten/build.gradle.kts index 766e0a56..4e621a74 100644 --- a/libraries/threeten/build.gradle.kts +++ b/libraries/threeten/build.gradle.kts @@ -1,4 +1,5 @@ import com.raxdenstudios.publishing.model.Coordinates +import com.raxdenstudios.publishing.model.Developer plugins { alias(libs.plugins.android.versioning) @@ -19,9 +20,11 @@ publishLibrary { description = "Threeten commons is a library with a set of useful classes to help to developer " + "to work with threeten." url = "https://github.com/raxden/android-commons" - developerId = "raxden" - developerName = "Ángel Gómez" - developerEmail = "raxden.dev@gmail.com" + developer = Developer( + id = "raxden", + name = "Ángel Gómez", + email = "raxden.dev@gmail.com", + ) coordinates = Coordinates.default.copy(artifactId = "commons-threeten") }