Merge pull request #178 from icerockdev/develop

Release 0.15.1
icerockdev · Apr 1, 2021 · bd70a49 · bd70a49
2 parents 2414967 + fe35a73
commit bd70a49
Show file tree

Hide file tree

Showing 72 changed files with 375 additions and 146 deletions.
diff --git a/.github/workflows/compilation-check.yml b/.github/workflows/compilation-check.yml
@@ -17,6 +17,6 @@ jobs:
         with:
           java-version: 1.8
       - name: Plugin check
-        run: ./gradlew -p plugins detekt build publishToMavenLocal
+        run: ./gradlew -p resources-generator detekt build publishToMavenLocal
       - name: Library check
         run: ./gradlew detekt build publishToMavenLocal check
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -1,12 +1,23 @@
-name: KMP library publish
+name: Create release
 
 on:
-  release:
-    types: [published]
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version'
+        default: '0.1.0'
+        required: true
 
 jobs:
-  build:
+  publish:
+    name: Publish library at mavenCentral
     runs-on: macOS-latest
+    env:
+      OSSRH_USER: ${{ secrets.OSSRH_USER }}
+      OSSRH_KEY: ${{ secrets.OSSRH_KEY }}
+      SIGNING_KEY_ID: ${{ secrets.SIGNING_KEYID }}
+      SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+      SIGNING_KEY: ${{ secrets.GPG_KEY_CONTENTS }}
 
     steps:
       - uses: actions/checkout@v1
@@ -15,6 +26,22 @@ jobs:
         with:
           java-version: 1.8
       - name: Publish plugin
-        run: ./gradlew -p plugins publishAllPublicationsToBintrayRepository -DBINTRAY_USER=${{ secrets.BINTRAY_USER }} -DBINTRAY_KEY=${{ secrets.BINTRAY_KEY }}
+        run: ./gradlew -p resources-generator publishMavenJavaPublicationToOSSRHRepository
       - name: Publish library
-        run: ./gradlew publishAllPublicationsToBintrayRepository -DBINTRAY_USER=${{ secrets.BINTRAY_USER }} -DBINTRAY_KEY=${{ secrets.BINTRAY_KEY }}
+        run: ./gradlew publish
+  release:
+    name: Create release
+    needs: publish
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          commitish: ${{ github.ref }}
+          tag_name: release/${{ github.event.inputs.version }}
+          release_name: Release ${{ github.event.inputs.version }}
+          body: "Will be filled later"
+          draft: true
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 ![moko-resources](img/logo.png)  
-[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](https://api.bintray.com/packages/icerockdev/moko/moko-resources/images/download.svg) ](https://bintray.com/icerockdev/moko/moko-resources/_latestVersion) ![kotlin-version](https://img.shields.io/badge/kotlin-1.4.21-orange)
+[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](https://img.shields.io/maven-central/v/dev.icerock.moko/resources) ](https://repo1.maven.org/maven2/dev/icerock/moko/moko-resources) ![kotlin-version](https://img.shields.io/badge/kotlin-1.4.31-orange)
 
 # Mobile Kotlin resources
 This is a Kotlin MultiPlatform library that provides access to the resources on iOS & Android with the support of the default system localization.
@@ -28,6 +28,7 @@ This is a Kotlin MultiPlatform library that provides access to the resources on
 - iOS version 9.0+
 
 ## Versions
+### Bintray
 - kotlin 1.3.50
   - 0.1.0
   - 0.2.0
@@ -58,24 +59,27 @@ This is a Kotlin MultiPlatform library that provides access to the resources on
   - 0.13.2
   - 0.14.0
   - 0.15.0
+### mavenCentral
+- kotlin 1.4.31
+  - 0.15.1
 
 ## Installation
 root build.gradle  
 ```groovy
 buildscript {
     repositories {
-        maven { url = "https://dl.bintray.com/icerockdev/plugins" }
+        mavenCentral()
     }
 
     dependencies {
-        classpath "dev.icerock.moko:resources-generator:0.15.0"
+        classpath "dev.icerock.moko:resources-generator:0.15.1"
     }
 }
 
 
 allprojects {
     repositories {
-        maven { url = "https://dl.bintray.com/icerockdev/moko" }
+        mavenCentral()
     }
 }
 ```
@@ -85,7 +89,7 @@ project build.gradle
 apply plugin: "dev.icerock.mobile.multiplatform-resources"
 
 dependencies {
-    commonMainApi("dev.icerock.moko:resources:0.15.0")
+    commonMainApi("dev.icerock.moko:resources:0.15.1")
 }
 
 multiplatformResources {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,35 +3,36 @@
  */
 
 plugins {
-    plugin(Deps.Plugins.detekt) apply false
+    id("io.gitlab.arturbosch.detekt") version("1.15.0") apply(false)
 }
 
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
 
-        maven { url = uri("https://dl.bintray.com/kotlin/kotlin") }
-        maven { url = uri("https://kotlin.bintray.com/kotlinx") }
-        maven { url = uri("https://plugins.gradle.org/m2/") }
-        maven { url = uri("https://dl.bintray.com/icerockdev/plugins") }
+        gradlePluginPortal()
     }
     dependencies {
-        plugin(Deps.Plugins.mokoResources)
+        classpath("dev.icerock.moko:resources-generator") // composite build used
+        classpath("gradle:resources-deps:1")
     }
 }
 
 allprojects {
     repositories {
+        mavenCentral()
         google()
-        jcenter()
 
-        maven { url = uri("https://kotlin.bintray.com/kotlin") }
-        maven { url = uri("https://kotlin.bintray.com/kotlinx") }
-        maven { url = uri("https://dl.bintray.com/icerockdev/moko") }
+        jcenter {
+            content {
+                includeGroup("org.jetbrains.trove4j")
+                includeModule("org.jetbrains.kotlinx", "kotlinx-html-jvm")
+            }
+        }
     }
 
-    apply(plugin = Deps.Plugins.detekt.id)
+    apply(plugin = "io.gitlab.arturbosch.detekt")
 
     configure<io.gitlab.arturbosch.detekt.extensions.DetektExtension> {
         input.setFrom("src/commonMain/kotlin", "src/androidMain/kotlin", "src/iosMain/kotlin")

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
diff --git a/gradle.properties b/gradle.properties
@@ -9,8 +9,4 @@ kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 android.useAndroidX=true
 
-# Workaround for Bintray treating .sha512 files as artifacts
-# https://github.com/gradle/gradle/issues/11412
-systemProp.org.gradle.internal.publish.checksums.insecure=true
-
 xcodeproj=./sample/ios-app
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/plugins/buildSrc/build.gradle.kts b/plugins/buildSrc/build.gradle.kts
diff --git a/plugins/buildSrc/src b/plugins/buildSrc/src
diff --git a/plugins/gradle b/plugins/gradle
diff --git a/plugins/resources-generator/build.gradle.kts b/plugins/resources-generator/build.gradle.kts
diff --git a/plugins/settings.gradle.kts b/plugins/settings.gradle.kts
diff --git a/resources-deps/build.gradle.kts b/resources-deps/build.gradle.kts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2019 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("org.jetbrains.kotlin.jvm") version("1.4.31")
+}
+
+repositories {
+    mavenCentral()
+    google()
+
+    jcenter {
+        content {
+            includeGroup("org.jetbrains.trove4j")
+        }
+    }
+}
+
+dependencies {
+    api("dev.icerock:mobile-multiplatform:0.9.1")
+    api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31")
+    api("com.android.tools.build:gradle:4.1.2")
+}
+
+group = "gradle"
+version = "1"
diff --git a/buildSrc/src/main/kotlin/Deps.kt → resources-deps/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt → resources-deps/src/main/kotlin/Deps.kt
@@ -3,8 +3,8 @@
  */
 
 object Deps {
-    private const val kotlinVersion = "1.4.21"
-    private const val androidGradleVersion = "4.0.1"
+    private const val kotlinVersion = "1.4.31"
+    private const val androidGradleVersion = "4.1.2"
 
     private const val androidAppCompatVersion = "1.1.0"
     private const val espressoCoreVersion = "3.2.0"
@@ -15,11 +15,11 @@ object Deps {
     private const val kotlinPoetVersion = "1.6.0"
     private const val kotlinxSerializationVersion = "1.0.0"
 
-    private const val detektVersion = "1.7.4"
+    private const val detektVersion = "1.15.0"
 
-    private const val mokoGraphicsVersion = "0.5.0"
-    private const val mokoParcelizeVersion = "0.5.0"
-    const val mokoResourcesVersion = "0.15.0"
+    private const val mokoGraphicsVersion = "0.6.1"
+    private const val mokoParcelizeVersion = "0.6.1"
+    const val mokoResourcesVersion = "0.15.1"
 
     object Android {
         const val compileSdk = 28
@@ -38,6 +38,7 @@ object Deps {
         val kotlinParcelize = GradlePlugin(id = "kotlin-parcelize")
         val kotlinSerialization = GradlePlugin(id = "kotlin-serialization")
         val mavenPublish = GradlePlugin(id = "org.gradle.maven-publish")
+        val signing = GradlePlugin(id = "signing")
 
         val mobileMultiplatform = GradlePlugin(id = "dev.icerock.mobile.multiplatform")
         val appleFramework = GradlePlugin(id = "dev.icerock.mobile.multiplatform.apple-framework")
@@ -46,11 +47,6 @@ object Deps {
             id = "dev.icerock.mobile.multiplatform-resources",
             module = "dev.icerock.moko:resources-generator:$mokoResourcesVersion"
         )
-
-        val detekt = GradlePlugin(
-            id = "io.gitlab.arturbosch.detekt",
-            version = detektVersion
-        )
     }
 
     object Libs {
@@ -66,7 +62,7 @@ object Deps {
                 const val testCore =
                     "androidx.test:core:1.3.0"
                 const val robolectric =
-                    "org.robolectric:robolectric:4.3"
+                    "org.robolectric:robolectric:4.4"
                 const val testRunner =
                     "androidx.test:runner:$testRunnerVersion"
                 const val testRules =