From 6919af1df4236918d8ba0cdab8c948964427c853 Mon Sep 17 00:00:00 2001 From: KonYaco Date: Tue, 14 Feb 2023 09:45:25 +0800 Subject: [PATCH 1/7] Update dependencies --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 45751e12..c69fb67a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ plugins { kotlin("multiplatform") version "1.7.20" apply false - id("org.jetbrains.compose") version "1.3.0-beta04-dev873" apply false + id("org.jetbrains.compose") version "1.3.0" apply false id("com.android.library") version "7.3.1" apply false id("org.jetbrains.kotlin.android") version "1.7.20" apply false } From e87e0f1f2eef3ccc119784e6d10700547158182b Mon Sep 17 00:00:00 2001 From: Elliot Nash Date: Tue, 4 Apr 2023 14:45:03 -0700 Subject: [PATCH 2/7] Add maven-publish plugin --- fluent-icons-core/build.gradle.kts | 1 + fluent-icons-extended/build.gradle.kts | 1 + fluent/build.gradle.kts | 1 + fluent/src/commonMain/kotlin/com/konyaco/fluent/Colors.kt | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fluent-icons-core/build.gradle.kts b/fluent-icons-core/build.gradle.kts index e33c4850..1f97302d 100644 --- a/fluent-icons-core/build.gradle.kts +++ b/fluent-icons-core/build.gradle.kts @@ -2,6 +2,7 @@ plugins { kotlin("multiplatform") id("org.jetbrains.compose") id("com.android.library") + id("maven-publish") } group = "com.konyaco.fluent" diff --git a/fluent-icons-extended/build.gradle.kts b/fluent-icons-extended/build.gradle.kts index 1a541cd9..dbdeccda 100644 --- a/fluent-icons-extended/build.gradle.kts +++ b/fluent-icons-extended/build.gradle.kts @@ -2,6 +2,7 @@ plugins { kotlin("multiplatform") id("org.jetbrains.compose") id("com.android.library") + id("maven-publish") } group = "com.konyaco.fluent" diff --git a/fluent/build.gradle.kts b/fluent/build.gradle.kts index dd70a3c1..126242eb 100644 --- a/fluent/build.gradle.kts +++ b/fluent/build.gradle.kts @@ -2,6 +2,7 @@ plugins { kotlin("multiplatform") id("org.jetbrains.compose") id("com.android.library") + id("maven-publish") } group = "com.konyaco.fluent" diff --git a/fluent/src/commonMain/kotlin/com/konyaco/fluent/Colors.kt b/fluent/src/commonMain/kotlin/com/konyaco/fluent/Colors.kt index cfc4f12e..32efb384 100644 --- a/fluent/src/commonMain/kotlin/com/konyaco/fluent/Colors.kt +++ b/fluent/src/commonMain/kotlin/com/konyaco/fluent/Colors.kt @@ -4,7 +4,6 @@ import androidx.compose.runtime.* import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.takeOrElse -import org.jetbrains.skia.defaultLanguageTag @Stable class Colors( From 156b05bc2b476f388f6e5f912e23ed1537572ac2 Mon Sep 17 00:00:00 2001 From: Elliot Nash Date: Sat, 8 Apr 2023 12:05:02 -0700 Subject: [PATCH 3/7] bump compose version --- build.gradle.kts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 45751e12..f2d163d6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,8 @@ plugins { - kotlin("multiplatform") version "1.7.20" apply false - id("org.jetbrains.compose") version "1.3.0-beta04-dev873" apply false - id("com.android.library") version "7.3.1" apply false - id("org.jetbrains.kotlin.android") version "1.7.20" apply false + kotlin("multiplatform") version "1.8.0" apply false + id("org.jetbrains.compose") version "1.3.1" apply false + id("com.android.library") version "7.4.2" apply false + id("org.jetbrains.kotlin.android") version "1.8.0" apply false } group = "com.konyaco.fluent" From bfd48d02f5d94dff86cefed908935a1f1217cd5f Mon Sep 17 00:00:00 2001 From: KonYaco Date: Sun, 9 Apr 2023 12:26:29 +0800 Subject: [PATCH 4/7] Add maven publish task --- fluent-icons-extended/build.gradle.kts | 25 +++++++++++++++++++++++-- fluent/build.gradle.kts | 25 +++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/fluent-icons-extended/build.gradle.kts b/fluent-icons-extended/build.gradle.kts index dbdeccda..194cc08c 100644 --- a/fluent-icons-extended/build.gradle.kts +++ b/fluent-icons-extended/build.gradle.kts @@ -5,7 +5,7 @@ plugins { id("maven-publish") } -group = "com.konyaco.fluent" +group = "com.konyaco" version = "0.0.1-dev3" kotlin { @@ -40,4 +40,25 @@ android { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } -} \ No newline at end of file +} + +publishing { + repositories { + maven { + name = "OSSRHSnapshot" + url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") + credentials { + username = System.getenv("MAVEN_USERNAME") + password = System.getenv("MAVEN_PASSWORD") + } + } + maven { + name = "OSSRH" + url = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") + credentials { + username = System.getenv("MAVEN_USERNAME") + password = System.getenv("MAVEN_PASSWORD") + } + } + } +} diff --git a/fluent/build.gradle.kts b/fluent/build.gradle.kts index 126242eb..b8e20230 100644 --- a/fluent/build.gradle.kts +++ b/fluent/build.gradle.kts @@ -5,7 +5,7 @@ plugins { id("maven-publish") } -group = "com.konyaco.fluent" +group = "com.konyaco" version = "0.0.1-dev3" kotlin { @@ -50,4 +50,25 @@ android { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } -} \ No newline at end of file +} + +publishing { + repositories { + maven { + name = "OSSRHSnapshot" + url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") + credentials { + username = System.getenv("MAVEN_USERNAME") + password = System.getenv("MAVEN_PASSWORD") + } + } + maven { + name = "OSSRH" + url = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") + credentials { + username = System.getenv("MAVEN_USERNAME") + password = System.getenv("MAVEN_PASSWORD") + } + } + } +} From 13fbed23eb554183c7380e2b451590462ae75dc3 Mon Sep 17 00:00:00 2001 From: KonYaco Date: Sun, 9 Apr 2023 12:32:07 +0800 Subject: [PATCH 5/7] Change groupId to com.konyaco --- build.gradle.kts | 2 +- fluent-icons-core/build.gradle.kts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6e751b9c..91fa5a42 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { id("org.jetbrains.kotlin.android") version "1.8.0" apply false } -group = "com.konyaco.fluent" +group = "com.konyaco" allprojects { repositories { diff --git a/fluent-icons-core/build.gradle.kts b/fluent-icons-core/build.gradle.kts index 1f97302d..e2f4773b 100644 --- a/fluent-icons-core/build.gradle.kts +++ b/fluent-icons-core/build.gradle.kts @@ -5,7 +5,7 @@ plugins { id("maven-publish") } -group = "com.konyaco.fluent" +group = "com.konyaco" version = "0.0.1-dev3" kotlin { @@ -38,4 +38,4 @@ android { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } -} \ No newline at end of file +} From 2a0112008f3add754aa2f8eb55023e3b1abe2b6c Mon Sep 17 00:00:00 2001 From: KonYaco Date: Sun, 9 Apr 2023 12:32:55 +0800 Subject: [PATCH 6/7] Correct control border gradient in dark mode. --- fluent/src/commonMain/kotlin/com/konyaco/fluent/Colors.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fluent/src/commonMain/kotlin/com/konyaco/fluent/Colors.kt b/fluent/src/commonMain/kotlin/com/konyaco/fluent/Colors.kt index 32efb384..ba9a6506 100644 --- a/fluent/src/commonMain/kotlin/com/konyaco/fluent/Colors.kt +++ b/fluent/src/commonMain/kotlin/com/konyaco/fluent/Colors.kt @@ -357,8 +357,8 @@ internal fun generateStroke(shades: Shades, darkMode: Boolean): Stroke = private fun generateBorders(fillAccent: FillAccentColors, stroke: Stroke, darkMode: Boolean): Borders = if (darkMode) Borders( control = Brush.verticalGradient( - 0.0957f to stroke.control.default, - 1f to stroke.control.secondary + 0.0957f to stroke.control.secondary, + 1f to stroke.control.default ), accentControl = Brush.verticalGradient( 0.9067f to stroke.control.onAccentDefault, @@ -397,4 +397,4 @@ private fun generateBorders(fillAccent: FillAccentColors, stroke: Stroke, darkMo 0.9395f to stroke.control.default, 0.9414f to fillAccent.default ) - ) \ No newline at end of file + ) From 0897a79c2dfc770ee474cd26151343814cb604cd Mon Sep 17 00:00:00 2001 From: KonYaco Date: Sun, 9 Apr 2023 12:51:04 +0800 Subject: [PATCH 7/7] Update 0.0.1-dev4 --- fluent-icons-core/build.gradle.kts | 2 +- fluent-icons-extended/build.gradle.kts | 2 +- fluent/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fluent-icons-core/build.gradle.kts b/fluent-icons-core/build.gradle.kts index e2f4773b..9b0275a0 100644 --- a/fluent-icons-core/build.gradle.kts +++ b/fluent-icons-core/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } group = "com.konyaco" -version = "0.0.1-dev3" +version = "0.0.1-dev4" kotlin { jvm() diff --git a/fluent-icons-extended/build.gradle.kts b/fluent-icons-extended/build.gradle.kts index 194cc08c..9775648f 100644 --- a/fluent-icons-extended/build.gradle.kts +++ b/fluent-icons-extended/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } group = "com.konyaco" -version = "0.0.1-dev3" +version = "0.0.1-dev4" kotlin { jvm() diff --git a/fluent/build.gradle.kts b/fluent/build.gradle.kts index b8e20230..61d971f9 100644 --- a/fluent/build.gradle.kts +++ b/fluent/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } group = "com.konyaco" -version = "0.0.1-dev3" +version = "0.0.1-dev4" kotlin { jvm()