Publish 1.5.0 to Maven Central

bright · Jun 24, 2024 · 93fe6fc · 93fe6fc
1 parent b1af12f
commit 93fe6fc
Show file tree

Hide file tree

Showing 17 changed files with 50 additions and 114 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/buildSrc/src/main/kotlin/Repositories.kt b/buildSrc/src/main/kotlin/Repositories.kt
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
diff --git 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
diff --git 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
@@ -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<MavenPublication>("release") {
-                from(components["release"])
-                groupId = Config.group
-                artifactId = "diffutil"
-                version = Config.version
-            }
-            register<MavenPublication>("debug") {
-                from(components["debug"])
-                groupId = Config.group
-                artifactId = "diffutil-debug"
-                version = Config.version
-            }
-        }
-    }
-}
diff --git 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.
diff --git 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
+
+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
diff --git 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" }
diff --git 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
@@ -0,0 +1,3 @@
+POM_ARTIFACT_ID=kequality
+POM_NAME=kequality
+POM_DESCRIPTION=A custom equality checking utility