From 0780aac1fc6124e3a739abe2ac59f6b7983d0234 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 17 Feb 2021 00:38:21 +0600 Subject: [PATCH 1/5] start 0.4.0-rc2 --- CHANGELOG.md | 2 ++ gradle.properties | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 540d171..537ed64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # SDI changelogs +## 0.4.0-rc2 + ## 0.4.0-rc **ALL PROJECT HAS MIGRATED FROM PACKAGE `com.insanusmokrassar` TO `dev.inmo`** diff --git a/gradle.properties b/gradle.properties index 4b1d038..bca076c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,6 @@ kotlin.code.style=official +org.gradle.parallel=true +kotlin.incremental.multiplatform=true kotlin_version=1.4.21 kotlin_serialisation_runtime_version=1.0.1 klassindex_version=4.1.0-rc.1 @@ -6,6 +8,4 @@ klassindex_version=4.1.0-rc.1 github_release_plugin_version=2.2.12 group=dev.inmo -version=0.4.0-rc - -kotlin.incremental.multiplatform=true +version=0.4.0-rc2 From f517f73fa4d6cfc94ab6ec2a5d7999d269a18aec Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 17 Feb 2021 00:39:35 +0600 Subject: [PATCH 2/5] update dependencies --- .travis.yml | 10 ---------- CHANGELOG.md | 3 +++ gradle.properties | 5 +++-- 3 files changed, 6 insertions(+), 12 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 67c6220..0000000 --- a/.travis.yml +++ /dev/null @@ -1,10 +0,0 @@ -language: java -install: true - -os: linux -dist: trusty -jdk: oraclejdk8 - -script: - - ./gradlew build allTests -s - diff --git a/CHANGELOG.md b/CHANGELOG.md index 537ed64..6f6e87f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## 0.4.0-rc2 +* `Kotlin`: `1.4.21` -> `1.4.30` +* `Serialization`: `1.0.1` -> `1.1.0-RC` + ## 0.4.0-rc **ALL PROJECT HAS MIGRATED FROM PACKAGE `com.insanusmokrassar` TO `dev.inmo`** diff --git a/gradle.properties b/gradle.properties index bca076c..fc86eec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,9 @@ kotlin.code.style=official org.gradle.parallel=true kotlin.incremental.multiplatform=true -kotlin_version=1.4.21 -kotlin_serialisation_runtime_version=1.0.1 + +kotlin_version=1.4.30 +kotlin_serialisation_runtime_version=1.1.0-RC klassindex_version=4.1.0-rc.1 github_release_plugin_version=2.2.12 From bd35df5f20a776fbe564b0c8025fc236c1cfb6e8 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 17 Feb 2021 00:41:09 +0600 Subject: [PATCH 3/5] update publishing scripts --- mpp_publish_config.kpsb | 2 +- publish.gradle | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mpp_publish_config.kpsb b/mpp_publish_config.kpsb index 0828bf6..8f5c991 100644 --- a/mpp_publish_config.kpsb +++ b/mpp_publish_config.kpsb @@ -1 +1 @@ -{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}","packageVcs":"https://git.insanusmokrassar.com/InsanusMokrassar/SDI.git","autoPublish":true,"overridePublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.insanusmokrassar.com/PostsSystem/SDI/src/master/LICENSE"}],"mavenConfig":{"name":"Simple Dependency Injector","description":"Simple library for creating dependencies tree using Kotlin Serialization","url":"https://git.insanusmokrassar.com/InsanusMokrassar/SDI","vcsUrl":"https://git.insanusmokrassar.com/InsanusMokrassar/SDI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}} \ No newline at end of file +{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}","packageVcs":"https://git.insanusmokrassar.com/InsanusMokrassar/SDI.git","autoPublish":true,"overridePublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.insanusmokrassar.com/PostsSystem/SDI/src/master/LICENSE"}],"mavenConfig":{"name":"Simple Dependency Injector","description":"Simple library for creating dependencies tree using Kotlin Serialization","url":"https://git.insanusmokrassar.com/InsanusMokrassar/SDI","vcsUrl":"https://git.insanusmokrassar.com/InsanusMokrassar/SDI.git","includeGpgSigning":true,"publishToMavenCentral":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}} \ No newline at end of file diff --git a/publish.gradle b/publish.gradle index 67f4cf9..44ccd6c 100644 --- a/publish.gradle +++ b/publish.gradle @@ -1,24 +1,9 @@ apply plugin: 'maven-publish' +apply plugin: 'signing' task javadocsJar(type: Jar) { classifier = 'javadoc' } -task sourceJar (type : Jar) { - classifier = 'sources' -} - -afterEvaluate { - project.publishing.publications.all { - // rename artifacts - groupId "${project.group}" - if (it.name.contains('kotlinMultiplatform')) { - artifactId = "${project.name}" - artifact sourceJar - } else { - artifactId = "${project.name}-$name" - } - } -} publishing { publications.all { @@ -63,7 +48,22 @@ publishing { password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') } } + + maven { + name = "sonatype" + url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/") + credentials { + username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER') + password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD') + } + } + } } } + +signing { + useGpgCmd() + sign publishing.publications +} From 81b8ebbfab9470d0b415935e31b9f01bec017979 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 17 Feb 2021 00:44:04 +0600 Subject: [PATCH 4/5] update gradle wrapper --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca8c529..9fccb7a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip From 68958f49b34d438e0030bf147eb83d15dfee6b5c Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 17 Feb 2021 00:45:01 +0600 Subject: [PATCH 5/5] add build workflow --- .github/workflows/build.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..ceab9f2 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,16 @@ +name: Build + +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Build with Gradle + run: ./gradlew build