diff --git a/.github/workflows/compilation-check.yml b/.github/workflows/compilation-check.yml new file mode 100644 index 0000000..14694e4 --- /dev/null +++ b/.github/workflows/compilation-check.yml @@ -0,0 +1,20 @@ +name: KMP library compilation check + +on: + pull_request: + branches: + - master + - develop + +jobs: + build: + runs-on: macOS-latest + + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Check build + run: ./gradlew -PlibraryPublish :graphics:publishToMavenLocal diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..ca50c71 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,18 @@ +name: KMP library publish + +on: + release: + types: [published] + +jobs: + build: + runs-on: macOS-latest + + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Publish + run: ./gradlew -PlibraryPublish :graphics:publishAllPublicationsToBintrayRepository -DBINTRAY_USER=${{ secrets.BINTRAY_USER }} -DBINTRAY_KEY=${{ secrets.BINTRAY_KEY }} diff --git a/README.md b/README.md index 0d2cdfe..4aea4fa 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![moko-graphics](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-graphics/images/download.svg) ](https://bintray.com/icerockdev/moko/moko-graphics/_latestVersion) ![kotlin-version](https://img.shields.io/badge/kotlin-1.3.60-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://api.bintray.com/packages/icerockdev/moko/moko-graphics/images/download.svg) ](https://bintray.com/icerockdev/moko/moko-graphics/_latestVersion) ![kotlin-version](https://img.shields.io/badge/kotlin-1.3.70-orange) # Mobile Kotlin graphics This is a Kotlin Multiplatform library that provides graphics primitives to common code. @@ -19,7 +19,7 @@ This is a Kotlin Multiplatform library that provides graphics primitives to comm - **Color** converting according to the platform-side requirements (argb/rgba). ## Requirements -- Gradle version 5.4.1+ +- Gradle version 5.6.4+ - Android API 16+ - iOS version 9.0+ @@ -28,6 +28,8 @@ This is a Kotlin Multiplatform library that provides graphics primitives to comm - 0.1.0 - kotlin 1.3.60 - 0.2.0 +- kotlin 1.3.70 + - 0.3.0 ## Installation root build.gradle @@ -42,15 +44,10 @@ allprojects { project build.gradle ```groovy dependencies { - commonMainApi("dev.icerock.moko:graphics:0.2.0") + commonMainApi("dev.icerock.moko:graphics:0.3.0") } ``` -settings.gradle -```groovy -enableFeaturePreview("GRADLE_METADATA") -``` - ## Usage ### Color ```kotlin @@ -71,7 +68,7 @@ Please see more examples in the [sample directory](sample). ## Set Up Locally - The [graphics directory](graphics) contains the `graphics` library; - The [sample directory](sample) contains sample apps for Android and iOS; plus the mpp-library connected to the apps; -- For local testing use the `:graphics:publishToMavenLocal` gradle task - so that sample apps use the locally published version. +- For local testing use the `./publishToMavenLocal.sh` script - so that sample apps use the locally published version. ## Contributing All development (both new features and bug fixes) is performed in the `develop` branch. This way `master` always contains the sources of the most recently released version. Please send PRs with bug fixes to the `develop` branch. Documentation fixes in the markdown files are an exception to this rule. They are updated directly in `master`. diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 25195d6..e258298 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -16,9 +16,9 @@ repositories { } dependencies { - implementation("dev.icerock:mobile-multiplatform:0.4.0") - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.60") - implementation("com.android.tools.build:gradle:3.5.2") + implementation("dev.icerock:mobile-multiplatform:0.6.0") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.70") + implementation("com.android.tools.build:gradle:3.6.1") } kotlinDslPluginOptions { diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 08f0cd2..9c29671 100755 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -9,7 +9,7 @@ object Versions { const val minSdk = 16 } - const val kotlin = "1.3.60" + const val kotlin = "1.3.70" object Plugins { const val kotlin = Versions.kotlin @@ -23,7 +23,7 @@ object Versions { } object MultiPlatform { - const val mokoGraphics: String = "0.2.0" + const val mokoGraphics: String = "0.3.0" } } } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4b7e1f3..5028f28 100755 --- 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-5.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/publishToMavenLocal.sh b/publishToMavenLocal.sh new file mode 100755 index 0000000..c4dea26 --- /dev/null +++ b/publishToMavenLocal.sh @@ -0,0 +1 @@ +./gradlew -PlibraryPublish :graphics:publishToMavenLocal $* \ No newline at end of file diff --git a/sample/ios-app/Podfile.lock b/sample/ios-app/Podfile.lock index 847f78a..095d952 100644 --- a/sample/ios-app/Podfile.lock +++ b/sample/ios-app/Podfile.lock @@ -13,4 +13,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 4fe4be1b815729054ce80d124b3c324811469f77 -COCOAPODS: 1.8.3 +COCOAPODS: 1.9.0