From 93fe6fcdb978ddc3acc246c37f916a39741e1561 Mon Sep 17 00:00:00 2001 From: Andrzej Zabost <5508894+azabost@users.noreply.github.com> Date: Mon, 24 Jun 2024 22:58:25 +0200 Subject: [PATCH] Publish 1.5.0 to Maven Central --- README.md | 10 +++---- androidBenchmark/build.gradle.kts | 4 --- androidBenchmark/gradle.properties | 2 -- buildSrc/build.gradle.kts | 1 - buildSrc/src/main/kotlin/Config.kt | 3 -- buildSrc/src/main/kotlin/Dependencies.kt | 15 ---------- buildSrc/src/main/kotlin/Repositories.kt | 3 -- buildSrc/src/main/kotlin/Versions.kt | 9 ------ .../kotlin/default-android-library.gradle.kts | 1 - .../kotlin/default-java-publish.gradle.kts | 11 ------- .../kotlin/default-kotlin-library.gradle.kts | 3 -- diffutil/build.gradle.kts | 28 ++---------------- diffutil/gradle.properties | 5 ++-- gradle.properties | 25 ++++++++++++++-- gradle/libs.versions.toml | 29 +++++++++---------- kequality/build.gradle.kts | 12 +------- kequality/gradle.properties | 3 ++ 17 files changed, 50 insertions(+), 114 deletions(-) delete mode 100644 buildSrc/src/main/kotlin/Dependencies.kt delete mode 100644 buildSrc/src/main/kotlin/Repositories.kt delete mode 100644 buildSrc/src/main/kotlin/Versions.kt delete mode 100644 buildSrc/src/main/kotlin/default-java-publish.gradle.kts create mode 100644 kequality/gradle.properties diff --git a/README.md b/README.md index 26b2850..5ad5437 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![](https://jitpack.io/v/bright/kequality.svg)](https://jitpack.io/#bright/kequality) +![build](https://github.com/bright/kequality/actions/workflows/build.yml/badge.svg?branch=master) # kequality # @@ -16,21 +16,21 @@ See [Usage examples](#usage-examples) below. ## Installation ## -First, add JitPack to your repositories block in Gradle build script. +First, make sure you have Maven Central in your repositories: ```gradle repositories { - maven("https://jitpack.io") + mavenCentral() } ``` Then, declare the dependency like: ```gradle // Base kequality features -implementation("com.github.bright.kequality:kequality:1.4.0") +implementation("dev.bright.kequality:kequality:1.5.0") // Android's RecyclerView DiffUtil integration -implementation("com.github.bright.kequality:diffutil:1.4.0") +implementation("dev.bright.kequality:diffutil:1.5.0") ``` ## Usage examples ## diff --git a/androidBenchmark/build.gradle.kts b/androidBenchmark/build.gradle.kts index d7bf8a4..feaf0d9 100644 --- a/androidBenchmark/build.gradle.kts +++ b/androidBenchmark/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.gradle.dsl.JvmTarget - plugins { alias(libs.plugins.dev.bright.android.library) alias(libs.plugins.android.benchmark) @@ -48,8 +46,6 @@ android { dependencies { implementation(projects.kequality) - implementation(platform(libs.kotlin.bom)) - implementation(libs.kotlin.stdlib) testImplementation(libs.kotlin.test) testImplementation(libs.kotlin.test.junit) testImplementation(libs.shouldko) diff --git a/androidBenchmark/gradle.properties b/androidBenchmark/gradle.properties index d591da1..a8284b4 100644 --- a/androidBenchmark/gradle.properties +++ b/androidBenchmark/gradle.properties @@ -1,3 +1 @@ -kotlin.code.style=official -android.useAndroidX=true android.enableAdditionalTestOutput=true diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index fa5e9cc..096eb9d 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -12,7 +12,6 @@ repositories { dependencies { implementation(libs.kotlin.gradlePlugin) implementation(libs.android.gradlePlugin) - //implementation(libs.gradleMavenPublishPlugin) } gradlePlugin { diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt index 0b8a945..31db4b1 100644 --- a/buildSrc/src/main/kotlin/Config.kt +++ b/buildSrc/src/main/kotlin/Config.kt @@ -1,9 +1,6 @@ import org.gradle.api.JavaVersion -//import org.jetbrains.kotlin.gradle.dsl.JvmTarget object Config { - const val group = "pl.brightinventions.kequality" - const val version = "1.4.0" /** * Since Gradle 8.8 a toolchain can also be set for the Gradle daemon (with some limitations) * See [the docs](https://docs.gradle.org/8.8/userguide/gradle_daemon.html#sec:daemon_jvm_criteria) for more info diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt deleted file mode 100644 index ae18d07..0000000 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ /dev/null @@ -1,15 +0,0 @@ -object Dependencies { - const val kotlinBom = "org.jetbrains.kotlin:kotlin-bom" - const val kotlinStdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8" - const val kotlinTest = "org.jetbrains.kotlin:kotlin-test" - const val kotlinReflect = "org.jetbrains.kotlin:kotlin-reflect" - const val kotlinTestJunit = "org.jetbrains.kotlin:kotlin-test-junit" - const val shouldko = "com.github.miensol:shouldko:${Versions.shouldko}" - const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}" - const val androidGradlePlugin = "com.android.tools.build:gradle:${Versions.androidGradlePlugin}" - const val androidBenchmarkGradlePlugin = "androidx.benchmark:benchmark-gradle-plugin:${Versions.androidBenchmark}" - const val recyclerView = "androidx.recyclerview:recyclerview:${Versions.recyclerView}" - const val androidTestRunner = "androidx.test:runner:${Versions.androidTestRunner}" - const val androidTestExtJunit = "androidx.test.ext:junit:${Versions.androidTestExtJunit}" - const val androidBenchmark = "androidx.benchmark:benchmark-junit4:${Versions.androidBenchmark}" -} diff --git a/buildSrc/src/main/kotlin/Repositories.kt b/buildSrc/src/main/kotlin/Repositories.kt deleted file mode 100644 index 356df64..0000000 --- a/buildSrc/src/main/kotlin/Repositories.kt +++ /dev/null @@ -1,3 +0,0 @@ -object Repositories { - const val jitpack = "https://jitpack.io/" -} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt deleted file mode 100644 index 3457645..0000000 --- a/buildSrc/src/main/kotlin/Versions.kt +++ /dev/null @@ -1,9 +0,0 @@ -object Versions { - const val kotlin = "1.9.24" // Keep in sync with buildSrc/build.gradle.kts - const val shouldko = "0.2.2" - const val recyclerView = "1.3.2" - const val androidGradlePlugin = "8.5.0" - const val androidTestRunner = "1.4.0" - const val androidTestExtJunit = "1.1.3" - const val androidBenchmark = "1.0.0" -} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/default-android-library.gradle.kts b/buildSrc/src/main/kotlin/default-android-library.gradle.kts index 38d6ab8..f71fab9 100644 --- a/buildSrc/src/main/kotlin/default-android-library.gradle.kts +++ b/buildSrc/src/main/kotlin/default-android-library.gradle.kts @@ -1,4 +1,3 @@ -import org.gradle.jvm.toolchain.JavaLanguageVersion import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { diff --git a/buildSrc/src/main/kotlin/default-java-publish.gradle.kts b/buildSrc/src/main/kotlin/default-java-publish.gradle.kts deleted file mode 100644 index 670b597..0000000 --- a/buildSrc/src/main/kotlin/default-java-publish.gradle.kts +++ /dev/null @@ -1,11 +0,0 @@ -plugins { - `maven-publish` -} - -publishing { - publications { - register("default") { - from(components["java"]) - } - } -} diff --git a/buildSrc/src/main/kotlin/default-kotlin-library.gradle.kts b/buildSrc/src/main/kotlin/default-kotlin-library.gradle.kts index 131b98e..20abef6 100644 --- a/buildSrc/src/main/kotlin/default-kotlin-library.gradle.kts +++ b/buildSrc/src/main/kotlin/default-kotlin-library.gradle.kts @@ -4,9 +4,6 @@ plugins { id("org.jetbrains.kotlin.jvm") } -group = Config.group -version = Config.version - java { toolchain { languageVersion.set(JavaLanguageVersion.of(Config.jvmToolchain)) diff --git a/diffutil/build.gradle.kts b/diffutil/build.gradle.kts index 9e0767e..cc93ed5 100644 --- a/diffutil/build.gradle.kts +++ b/diffutil/build.gradle.kts @@ -1,14 +1,11 @@ -import org.jetbrains.kotlin.gradle.dsl.JvmTarget - plugins { alias(libs.plugins.dev.bright.android.library) - //alias(libs.plugins.publish) - `maven-publish` + alias(libs.plugins.maven.publish) } android { namespace = "pl.brightinventions.kequality.diffutil" - + defaultConfig { minSdk = 1 compileSdk = 34 @@ -22,29 +19,8 @@ android { dependencies { api(projects.kequality) - implementation(platform(libs.kotlin.bom)) - implementation(libs.kotlin.stdlib) implementation(libs.androidx.recyclerview) testImplementation(libs.kotlin.test) testImplementation(libs.kotlin.test.junit) testImplementation(libs.shouldko) } - -afterEvaluate { - publishing { - publications { - register("release") { - from(components["release"]) - groupId = Config.group - artifactId = "diffutil" - version = Config.version - } - register("debug") { - from(components["debug"]) - groupId = Config.group - artifactId = "diffutil-debug" - version = Config.version - } - } - } -} \ No newline at end of file diff --git a/diffutil/gradle.properties b/diffutil/gradle.properties index 6d8d6ec..ef178ed 100644 --- a/diffutil/gradle.properties +++ b/diffutil/gradle.properties @@ -1,2 +1,3 @@ -kotlin.code.style=official -android.useAndroidX=true +POM_ARTIFACT_ID=diffutil +POM_NAME=Android DiffUtil adapter +POM_DESCRIPTION=Equality adapter for Andriod DiffUtil. Removes the typical DiffUtil boilerplate. \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 3846d63..b1765d4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,25 @@ -kotlin.code.style=official org.gradle.jvmargs=-Xmx5g org.gradle.parallel=true -android.useAndroidX=true \ No newline at end of file + +kotlin.code.style=official +android.useAndroidX=true + +GROUP=dev.bright.kequality +VERSION_NAME=1.5.0 + +POM_URL=https://github.com/bright/kequality/ + +POM_LICENSE_NAME=MIT License +POM_LICENSE_URL=https://opensource.org/license/mit +POM_LICENSE_DIST=repo + +POM_SCM_URL=https://github.com/bright/kequality/ +POM_SCM_CONNECTION=scm:git:git://github.com/bright/kequality.git +POM_SCM_DEV_CONNECTION=scm:git:ssh://github.com:bright/kequality.git + +POM_DEVELOPER_ID=bright +POM_DEVELOPER_NAME=Bright Inventions +POM_DEVELOPER_URL=https://github.com/bright/ + +SONATYPE_HOST=S01 +RELEASE_SIGNING_ENABLED=true \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 628a7fe..ff3d742 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,37 +1,34 @@ [versions] kotlin = "1.9.24" -gradleMavenPublishPlugin = "0.28.0" androidGradlePlugin = "8.5.0" +gradleMavenPublishPlugin = "0.29.0" androidBenchmark = "1.2.4" -androidTestExtJunit = "1.1.3" -androidTestRunner = "1.4.0" -recyclerView = "1.3.2" -shouldko = "0.2.2" [libraries] +# Plugins treated as libraries for buildSrc android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" } - kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } -kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } -kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" } -kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } + kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } -kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } -androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerView" } -androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidTestRunner" } -androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidTestExtJunit" } + androidx-benchmark = { module = "androidx.benchmark:benchmark-junit4", version.ref = "androidBenchmark" } +androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.3.2" } + +kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } +kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } -gradleMavenPublishPlugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradleMavenPublishPlugin" } +androidx-test-runner = { module = "androidx.test:runner", version = "1.4.0" } +androidx-test-ext-junit = { module = "androidx.test.ext:junit", version = "1.1.3" } -shouldko = { module = "com.github.miensol:shouldko", version.ref = "shouldko" } +shouldko = { module = "com.github.miensol:shouldko", version = "0.2.2" } [plugins] kotlin-jvm = { id = "org.jetbrains.kotlin.jvm" } kotlin-android = { id = "org.jetbrains.kotlin.android" } android-library = { id = "com.android.library" } android-benchmark = { id = "androidx.benchmark", version.ref = "androidBenchmark" } -publish = { id = "com.vanniktech.maven.publish", version.ref = "gradleMavenPublishPlugin" } +maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "gradleMavenPublishPlugin" } +# From buildSrc dev-bright-android-library = { id = "dev.bright.android.library" } dev-bright-kotlin-library = { id = "dev.bright.kotlin.library" } \ No newline at end of file diff --git a/kequality/build.gradle.kts b/kequality/build.gradle.kts index bc50ded..a2c4e0f 100644 --- a/kequality/build.gradle.kts +++ b/kequality/build.gradle.kts @@ -1,20 +1,10 @@ -import org.jetbrains.kotlin.gradle.dsl.JvmTarget - plugins { alias(libs.plugins.kotlin.jvm) - id("default-java-publish") + alias(libs.plugins.maven.publish) alias(libs.plugins.dev.bright.kotlin.library) } - -java { - withJavadocJar() - withSourcesJar() -} - dependencies { - implementation(platform(libs.kotlin.bom)) - implementation(libs.kotlin.stdlib) testImplementation(libs.kotlin.test) testImplementation(libs.kotlin.test.junit) testImplementation(libs.shouldko) diff --git a/kequality/gradle.properties b/kequality/gradle.properties new file mode 100644 index 0000000..da33e8b --- /dev/null +++ b/kequality/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=kequality +POM_NAME=kequality +POM_DESCRIPTION=A custom equality checking utility \ No newline at end of file