Skip to content

Commit

Permalink
Merge pull request #3 from icerockdev/develop
Browse files Browse the repository at this point in the history
Release 0.3.0
  • Loading branch information
Alex009 authored Mar 14, 2020
2 parents 6bc678d + 3c66f61 commit 898f878
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 16 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/compilation-check.yml
Original file line number Diff line number Diff line change
@@ -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
18 changes: 18 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -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 }}
15 changes: 6 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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+

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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`.
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -23,7 +23,7 @@ object Versions {
}

object MultiPlatform {
const val mokoGraphics: String = "0.2.0"
const val mokoGraphics: String = "0.3.0"
}
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions publishToMavenLocal.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
./gradlew -PlibraryPublish :graphics:publishToMavenLocal $*
2 changes: 1 addition & 1 deletion sample/ios-app/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 4fe4be1b815729054ce80d124b3c324811469f77

COCOAPODS: 1.8.3
COCOAPODS: 1.9.0

0 comments on commit 898f878

Please sign in to comment.