Merge pull request #1 from icerockdev/develop

update to kotlin 1.3.60

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-core/images/download.svg) ](https://bintray.com/icerockdev/moko/moko-core/_latestVersion) ![kotlin-version](https://img.shields.io/badge/kotlin-1.3.50-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.60-orange)
 
 # Mobile Kotlin graphics
 This is a Kotlin Multiplatform library that provides graphics primitives to common code.  
@@ -26,6 +26,8 @@ This is a Kotlin Multiplatform library that provides graphics primitives to comm
 ## Versions
 - kotlin 1.3.50
   - 0.1.0
+- kotlin 1.3.60
+  - 0.2.0
 
 ## Installation
 root build.gradle  
@@ -40,7 +42,7 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:graphics:0.1.0")
+    commonMainApi("dev.icerock.moko:graphics:0.2.0")
 }
 ```
 

buildSrc/build.gradle.kts

@@ -16,9 +16,9 @@ repositories {
 }
 
 dependencies {
-    implementation("dev.icerock:mobile-multiplatform:0.3.0")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
-    implementation("com.android.tools.build:gradle:3.5.0")
+    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")
 }
 
 kotlinDslPluginOptions {

buildSrc/src/main/kotlin/Versions.kt

@@ -9,7 +9,7 @@ object Versions {
         const val minSdk = 16
     }
 
-    const val kotlin = "1.3.50"
+    const val kotlin = "1.3.60"
 
     object Plugins {
         const val kotlin = Versions.kotlin
@@ -18,12 +18,12 @@ object Versions {
 
     object Libs {
         object Android {
-            const val appCompat = "1.0.2"
+            const val appCompat = "1.1.0"
             const val annotation = "1.1.0"
         }
 
         object MultiPlatform {
-            const val mokoGraphics: String = "0.1.0"
+            const val mokoGraphics: String = "0.2.0"
         }
     }
 }

graphics/src/androidMain/kotlin/dev/icerock/moko/graphics/ColorExt.kt

@@ -8,6 +8,5 @@ import androidx.annotation.ColorInt
 
 @ColorInt
 fun Color.colorInt(): Int {
-    val maxColorValue: Int = 0xFF
     return argb.toInt()
 }

graphics/src/commonMain/kotlin/dev/icerock/moko/graphics/Color.kt

@@ -19,4 +19,11 @@ data class Color(
             green.toLong().shl(8) or
             red.toLong().shl(16) or
             alpha.toLong().shl(24)
+
+    constructor(colorRGBA: Long) : this(
+        red = (colorRGBA.shr(24) and 0xFF).toInt(),
+        green = (colorRGBA.shr(16) and 0xFF).toInt(),
+        blue = (colorRGBA.shr(8) and 0xFF).toInt(),
+        alpha = (colorRGBA.shr(0) and 0xFF).toInt()
+    )
 }

settings.gradle.kts

@@ -19,6 +19,13 @@ pluginManagement {
 
 enableFeaturePreview("GRADLE_METADATA")
 
+val properties = startParameter.projectProperties
+
+// ./gradlew -PlibraryPublish publishToMavenLocal
+val libraryPublish: Boolean = properties.containsKey("libraryPublish")
+
 include(":graphics")
-include(":sample:android-app")
-include(":sample:mpp-library")
+if(!libraryPublish) {
+    include(":sample:android-app")
+    include(":sample:mpp-library")
+}