From b2afe8731619d91c32ffd6d0759d7026f9a14c28 Mon Sep 17 00:00:00 2001 From: dohunkim0104 Date: Mon, 10 May 2021 19:47:57 +0900 Subject: [PATCH 1/6] =?UTF-8?q?jitpack=20=EB=B0=B0=ED=8F=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 - buildSrc/src/main/java/dependencies/Versions.kt | 5 +++-- gradle/publish.gradle | 15 +++++++++++++++ kinda-android-test/build.gradle | 8 ++++++-- kinda-android/build.gradle | 8 ++++++-- kinda-core/build.gradle | 1 - 6 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 gradle/publish.gradle diff --git a/build.gradle b/build.gradle index 5b6066e..0ac0aa2 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,6 @@ allprojects { repositories { google() mavenCentral() - maven { url "https://jitpack.io" } } } diff --git a/buildSrc/src/main/java/dependencies/Versions.kt b/buildSrc/src/main/java/dependencies/Versions.kt index 590b70c..6223e1e 100644 --- a/buildSrc/src/main/java/dependencies/Versions.kt +++ b/buildSrc/src/main/java/dependencies/Versions.kt @@ -7,9 +7,10 @@ object Versions { const val targetSdkVersion = 30 private const val majorVersion = 1 - private const val minorVersion = 1 + private const val minorVersion = 4 private const val patchVersion = 0 + private const val postfix = "SNAPSHOT" const val versionCode = (100 * majorVersion) + (10 * minorVersion) + patchVersion - const val versionName = "$majorVersion.$minorVersion.$patchVersion" + const val versionName = "$majorVersion.$minorVersion.$patchVersion-${postfix}" } \ No newline at end of file diff --git a/gradle/publish.gradle b/gradle/publish.gradle new file mode 100644 index 0000000..9ca61e6 --- /dev/null +++ b/gradle/publish.gradle @@ -0,0 +1,15 @@ +apply plugin: 'maven-publish' + +afterEvaluate { + publishing { + publications { + release(MavenPublication) { + from components.release + groupId = "com.github.kimdohun0104.kinda" + + artifactId = releaseArtifactId + version = releaseVersion + } + } + } +} \ No newline at end of file diff --git a/kinda-android-test/build.gradle b/kinda-android-test/build.gradle index dfbf7d5..377f375 100644 --- a/kinda-android-test/build.gradle +++ b/kinda-android-test/build.gradle @@ -3,9 +3,13 @@ import dependencies.Versions apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'maven-publish' -group = 'com.github.kimdohun0104.kinda' +apply from: rootProject.file('gradle/publish.gradle') + +ext { + releaseVersion = Versions.versionName + releaseArtifactId = "kinda-android-test" +} android { compileSdkVersion Versions.compileSdkVersion diff --git a/kinda-android/build.gradle b/kinda-android/build.gradle index 85b9d97..08a1586 100644 --- a/kinda-android/build.gradle +++ b/kinda-android/build.gradle @@ -3,9 +3,13 @@ import dependencies.Versions apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'maven-publish' -group = 'com.github.kimdohun0104.kinda' +apply from: rootProject.file('gradle/publish.gradle') + +ext { + releaseVersion = Versions.versionName + releaseArtifactId = "kinda-android" +} android { compileSdkVersion Versions.compileSdkVersion diff --git a/kinda-core/build.gradle b/kinda-core/build.gradle index d3f46e4..9b7d101 100644 --- a/kinda-core/build.gradle +++ b/kinda-core/build.gradle @@ -2,7 +2,6 @@ import dependencies.Deps apply plugin: 'java-library' apply plugin: 'kotlin' -apply plugin: 'maven-publish' group = 'com.github.kimdohun0104.kinda' From 175447f9e75e8928f5444c1834168dd38c8b3496 Mon Sep 17 00:00:00 2001 From: dohunkim0104 Date: Mon, 10 May 2021 19:50:05 +0900 Subject: [PATCH 2/6] =?UTF-8?q?maven=20plugin=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kinda-core/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/kinda-core/build.gradle b/kinda-core/build.gradle index 9b7d101..d3f46e4 100644 --- a/kinda-core/build.gradle +++ b/kinda-core/build.gradle @@ -2,6 +2,7 @@ import dependencies.Deps apply plugin: 'java-library' apply plugin: 'kotlin' +apply plugin: 'maven-publish' group = 'com.github.kimdohun0104.kinda' From 3c493a02bddd39f7fb8688c114fd0e6ef56fa5cc Mon Sep 17 00:00:00 2001 From: dohunkim0104 Date: Mon, 10 May 2021 19:50:41 +0900 Subject: [PATCH 3/6] =?UTF-8?q?version=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildSrc/src/main/java/dependencies/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/dependencies/Versions.kt b/buildSrc/src/main/java/dependencies/Versions.kt index 6223e1e..ed39d86 100644 --- a/buildSrc/src/main/java/dependencies/Versions.kt +++ b/buildSrc/src/main/java/dependencies/Versions.kt @@ -9,7 +9,7 @@ object Versions { private const val majorVersion = 1 private const val minorVersion = 4 private const val patchVersion = 0 - private const val postfix = "SNAPSHOT" + private const val postfix = "SNAPSHOT4" const val versionCode = (100 * majorVersion) + (10 * minorVersion) + patchVersion const val versionName = "$majorVersion.$minorVersion.$patchVersion-${postfix}" From c05563f9ba2542e3de6bc13989198db6d58a1964 Mon Sep 17 00:00:00 2001 From: dohunkim0104 Date: Mon, 10 May 2021 20:13:31 +0900 Subject: [PATCH 4/6] =?UTF-8?q?jitpack=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kinda-core/build.gradle | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/kinda-core/build.gradle b/kinda-core/build.gradle index d3f46e4..dbfac76 100644 --- a/kinda-core/build.gradle +++ b/kinda-core/build.gradle @@ -1,10 +1,23 @@ import dependencies.Deps +import dependencies.Versions apply plugin: 'java-library' apply plugin: 'kotlin' apply plugin: 'maven-publish' -group = 'com.github.kimdohun0104.kinda' +afterEvaluate { + publishing { + publications { + mavenAar(MavenPublication) { + from components.java + groupId = "com.github.kimdohun0104.kinda" + + artifactId = "kinda-core" + version = Versions.versionName + } + } + } +} dependencies { implementation Deps.Kotlin.coroutine From add6fb7a4efb39a768b7f66d6c2f840accecd26f Mon Sep 17 00:00:00 2001 From: dohunkim0104 Date: Mon, 10 May 2021 20:22:53 +0900 Subject: [PATCH 5/6] =?UTF-8?q?version=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildSrc/src/main/java/dependencies/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/dependencies/Versions.kt b/buildSrc/src/main/java/dependencies/Versions.kt index ed39d86..62de027 100644 --- a/buildSrc/src/main/java/dependencies/Versions.kt +++ b/buildSrc/src/main/java/dependencies/Versions.kt @@ -9,7 +9,7 @@ object Versions { private const val majorVersion = 1 private const val minorVersion = 4 private const val patchVersion = 0 - private const val postfix = "SNAPSHOT4" + private const val postfix = "SNAPSHOT6" const val versionCode = (100 * majorVersion) + (10 * minorVersion) + patchVersion const val versionName = "$majorVersion.$minorVersion.$patchVersion-${postfix}" From c49a97a7894e68b6f4786195a986fa9ffa41f95d Mon Sep 17 00:00:00 2001 From: dohunkim0104 Date: Mon, 10 May 2021 21:03:14 +0900 Subject: [PATCH 6/6] =?UTF-8?q?version=20=EC=82=AD=EC=A0=9C=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/publish.gradle | 1 - kinda-android-test/build.gradle | 1 - kinda-android/build.gradle | 1 - kinda-core/build.gradle | 1 - 4 files changed, 4 deletions(-) diff --git a/gradle/publish.gradle b/gradle/publish.gradle index 9ca61e6..6f79f34 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -8,7 +8,6 @@ afterEvaluate { groupId = "com.github.kimdohun0104.kinda" artifactId = releaseArtifactId - version = releaseVersion } } } diff --git a/kinda-android-test/build.gradle b/kinda-android-test/build.gradle index 377f375..99aed1f 100644 --- a/kinda-android-test/build.gradle +++ b/kinda-android-test/build.gradle @@ -7,7 +7,6 @@ apply plugin: 'kotlin-android' apply from: rootProject.file('gradle/publish.gradle') ext { - releaseVersion = Versions.versionName releaseArtifactId = "kinda-android-test" } diff --git a/kinda-android/build.gradle b/kinda-android/build.gradle index 08a1586..0b6e9bc 100644 --- a/kinda-android/build.gradle +++ b/kinda-android/build.gradle @@ -7,7 +7,6 @@ apply plugin: 'kotlin-android' apply from: rootProject.file('gradle/publish.gradle') ext { - releaseVersion = Versions.versionName releaseArtifactId = "kinda-android" } diff --git a/kinda-core/build.gradle b/kinda-core/build.gradle index dbfac76..e37d35e 100644 --- a/kinda-core/build.gradle +++ b/kinda-core/build.gradle @@ -13,7 +13,6 @@ afterEvaluate { groupId = "com.github.kimdohun0104.kinda" artifactId = "kinda-core" - version = Versions.versionName } } }