From 0768c7d92dad5bb872741ab06c9af941e2df4058 Mon Sep 17 00:00:00 2001 From: Aleksey Mikhailov Date: Tue, 19 Nov 2019 10:52:02 +0700 Subject: [PATCH 1/6] add secondary Color constructor from rgba color number --- .../commonMain/kotlin/dev/icerock/moko/graphics/Color.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/graphics/src/commonMain/kotlin/dev/icerock/moko/graphics/Color.kt b/graphics/src/commonMain/kotlin/dev/icerock/moko/graphics/Color.kt index 0792b3c..e73acdd 100755 --- a/graphics/src/commonMain/kotlin/dev/icerock/moko/graphics/Color.kt +++ b/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() + ) } From d495b0384136093caaaa3a8d848a2b8c3e755167 Mon Sep 17 00:00:00 2001 From: Aleksey Mikhailov Date: Tue, 19 Nov 2019 10:52:23 +0700 Subject: [PATCH 2/6] setup condition configuration of modules --- settings.gradle.kts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index bdcf747..7de19d8 100644 --- a/settings.gradle.kts +++ b/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") +} From 4a65c457c87212092f0b40a72a6a45a9137723a1 Mon Sep 17 00:00:00 2001 From: Aleksey Mikhailov Date: Tue, 19 Nov 2019 10:52:48 +0700 Subject: [PATCH 3/6] update to kotlin 1.3.60 --- buildSrc/build.gradle.kts | 6 +++--- buildSrc/src/main/kotlin/Versions.kt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 396e934..25195d6 100644 --- a/buildSrc/build.gradle.kts +++ b/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 { diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index dc9441b..63221b0 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.50" + const val kotlin = "1.3.60" object Plugins { const val kotlin = Versions.kotlin @@ -18,7 +18,7 @@ object Versions { object Libs { object Android { - const val appCompat = "1.0.2" + const val appCompat = "1.1.0" const val annotation = "1.1.0" } From 76b78528110f1fc93e57d90ec53145753eee3a59 Mon Sep 17 00:00:00 2001 From: Aleksey Mikhailov Date: Tue, 19 Nov 2019 10:52:57 +0700 Subject: [PATCH 4/6] version up --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 63221b0..08f0cd2 100755 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -23,7 +23,7 @@ object Versions { } object MultiPlatform { - const val mokoGraphics: String = "0.1.0" + const val mokoGraphics: String = "0.2.0" } } } \ No newline at end of file From b8246607caa28a1a731a342fb4492f7830b67d6a Mon Sep 17 00:00:00 2001 From: Aleksey Mikhailov Date: Tue, 19 Nov 2019 10:53:13 +0700 Subject: [PATCH 5/6] update readme --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c1402d7..0d2cdfe 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-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") } ``` From 35a1777758d4d2e0c4bb2dc1c68eae6add128e98 Mon Sep 17 00:00:00 2001 From: Aleksey Mikhailov Date: Tue, 19 Nov 2019 10:56:18 +0700 Subject: [PATCH 6/6] remove unused code --- .../src/androidMain/kotlin/dev/icerock/moko/graphics/ColorExt.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/graphics/src/androidMain/kotlin/dev/icerock/moko/graphics/ColorExt.kt b/graphics/src/androidMain/kotlin/dev/icerock/moko/graphics/ColorExt.kt index 23bc1a2..2222698 100644 --- a/graphics/src/androidMain/kotlin/dev/icerock/moko/graphics/ColorExt.kt +++ b/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() }