Merge branch 'InsertKoinIO:main' into patch-1

InsertKoinIO · Jan 26, 2024 · e268db3 · e268db3
2 parents 6ee1f18 + 7c1c871
commit e268db3
Show file tree

Hide file tree

Showing 16 changed files with 86 additions and 11 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -20,6 +20,17 @@ buildscript {
 
 plugins {
     id 'org.jetbrains.kotlinx.binary-compatibility-validator' version "$validator_version"
+    id 'io.github.gradle-nexus.publish-plugin' version "$publish_plugin_version"
+}
+
+nexusPublishing {
+    repositories {
+        sonatype {
+            nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
+            username = findProperty('OSSRH_USERNAME') ?: System.getenv('OSSRH_USERNAME') ?: ""
+            password = findProperty('OSSRH_PASSWORD') ?: System.getenv('OSSRH_PASSWORD') ?: ""
+        }
+    }
 }
 
 wrapper {

diff --git a/android/gradle/versions.gradle b/android/gradle/versions.gradle
@@ -1,6 +1,6 @@
 ext {
     // Koin Versions
-    koin_android_version = '3.5.3'
+    koin_android_version = '3.5.4-beta-1'
 
     // build Tools
     android_min_version = 14

diff --git a/android/release.sh b/android/release.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-../gradlew publishAllPublicationsToStagingRepository --max-workers 1
+../gradlew publishToSonatype
diff --git a/bom/gradle/versions.gradle b/bom/gradle/versions.gradle
@@ -1,3 +1,3 @@
 ext {
-    koin_bom_version = '3.5.3'
+    koin_bom_version = '3.5.4-beta-1'
 }
diff --git a/compose/build.gradle b/compose/build.gradle
@@ -24,6 +24,17 @@ buildscript {
 
 plugins {
     id 'org.jetbrains.kotlinx.binary-compatibility-validator' version "$validator_version"
+    id 'io.github.gradle-nexus.publish-plugin' version "$publish_plugin_version"
+}
+
+nexusPublishing {
+    repositories {
+        sonatype {
+            nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
+            username = findProperty('OSSRH_USERNAME') ?: System.getenv('OSSRH_USERNAME') ?: ""
+            password = findProperty('OSSRH_PASSWORD') ?: System.getenv('OSSRH_PASSWORD') ?: ""
+        }
+    }
 }
 
 wrapper {

diff --git a/compose/gradle/versions.gradle b/compose/gradle/versions.gradle
@@ -1,8 +1,8 @@
 ext {
 
     // Koin Versions
-    koin_androidx_compose_version = '3.5.3'
-    koin_compose_version = "1.1.2"
+    koin_androidx_compose_version = '3.5.4-beta-1'
+    koin_compose_version = "1.1.3-beta-1"
 
     // Compose
     compose_compiler = "1.5.6"

diff --git a/compose/release.sh b/compose/release.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-./gradlew publishAllPublicationsToStagingRepository --max-workers 1
+./gradlew publishToSonatype
 
diff --git a/core/build.gradle b/core/build.gradle
@@ -11,11 +11,24 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // Dokka
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
+        // Publish Plugin
+        classpath "io.github.gradle-nexus:publish-plugin:$publish_plugin_version"
     }
 }
 
 plugins {
     id 'org.jetbrains.kotlinx.binary-compatibility-validator' version "$validator_version"
+    id 'io.github.gradle-nexus.publish-plugin' version "$publish_plugin_version"
+}
+
+nexusPublishing {
+    repositories {
+        sonatype {
+            nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
+            username = findProperty('OSSRH_USERNAME') ?: System.getenv('OSSRH_USERNAME') ?: ""
+            password = findProperty('OSSRH_PASSWORD') ?: System.getenv('OSSRH_PASSWORD') ?: ""
+        }
+    }
 }
 
 wrapper {

diff --git a/core/gradle/versions.gradle b/core/gradle/versions.gradle
@@ -1,6 +1,6 @@
 ext {
     // Koin Versions
-    koin_version = '3.5.3'
+    koin_version = '3.5.4-beta-1'
 
     // Kotlin
     kotlin_version = '1.9.21'
@@ -18,4 +18,7 @@ ext {
     junit5_version = "5.9.3"
     mockito_version = "4.7.0"
     mockk_version = "1.12.2"
+
+    // Publish Plugin
+    publish_plugin_version = '2.0.0-rc-1'
 }
diff --git a/core/release.sh b/core/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-../gradlew publishAllPublicationsToStagingRepository --max-workers 1
+../gradlew publishToSonatype
 
 
diff --git a/ktor/build.gradle b/ktor/build.gradle
@@ -17,6 +17,17 @@ buildscript {
 
 plugins {
     id 'org.jetbrains.kotlinx.binary-compatibility-validator' version "$validator_version"
+    id 'io.github.gradle-nexus.publish-plugin' version "$publish_plugin_version"
+}
+
+nexusPublishing {
+    repositories {
+        sonatype {
+            nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
+            username = findProperty('OSSRH_USERNAME') ?: System.getenv('OSSRH_USERNAME') ?: ""
+            password = findProperty('OSSRH_PASSWORD') ?: System.getenv('OSSRH_PASSWORD') ?: ""
+        }
+    }
 }
 
 wrapper {

diff --git a/ktor/gradle/versions.gradle b/ktor/gradle/versions.gradle
@@ -1,6 +1,6 @@
 ext {
     // Koin
-    koin_ktor_version = '3.5.3'
+    koin_ktor_version = '3.5.4-beta-1'
     // Ktor
     ktor_version = '2.3.7'
 }
diff --git a/ktor/release.sh b/ktor/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-../gradlew publishAllPublicationsToStagingRepository --max-workers 1
+../gradlew publishToSonatype
 
 
diff --git a/plugins/build.gradle b/plugins/build.gradle
@@ -16,6 +16,20 @@ buildscript {
     }
 }
 
+plugins {
+    id 'io.github.gradle-nexus.publish-plugin' version "$publish_plugin_version"
+}
+
+nexusPublishing {
+    repositories {
+        sonatype {
+            nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
+            username = findProperty('OSSRH_USERNAME') ?: System.getenv('OSSRH_USERNAME') ?: ""
+            password = findProperty('OSSRH_PASSWORD') ?: System.getenv('OSSRH_PASSWORD') ?: ""
+        }
+    }
+}
+
 wrapper {
     distributionType = Wrapper.DistributionType.ALL
 }

diff --git a/plugins/release.sh b/plugins/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-../gradlew publishAllPublicationsToStagingRepository --max-workers 1
+../gradlew publishToSonatype
 
 
diff --git a/release_all.sh b/release_all.sh
@@ -8,6 +8,18 @@ cd ./android
 ./release.sh
 cd ..
 
+cd ./compose
+./release.sh
+cd ..
+
+cd ./ktor
+./release.sh
+cd ..
+
 cd ./plugins
 ./release.sh
 cd ..
+
+cd ./bom
+./release.sh
+cd ..