Merge pull request #8 from Konyaco/dev

Dev
Konyaco · Apr 9, 2023 · 66df10a · 66df10a
2 parents 4f1cbbf + 0897a79
commit 66df10a
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 19 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,16 +1,16 @@
 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"
+group = "com.konyaco"
 
 allprojects {
     repositories {
         google()
         mavenCentral()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
-}
+}
diff --git a/fluent-icons-core/build.gradle.kts b/fluent-icons-core/build.gradle.kts
@@ -2,10 +2,11 @@ plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
     id("com.android.library")
+    id("maven-publish")
 }
 
-group = "com.konyaco.fluent"
-version = "0.0.1-dev3"
+group = "com.konyaco"
+version = "0.0.1-dev4"
 
 kotlin {
     jvm()
@@ -37,4 +38,4 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-}
+}
diff --git a/fluent-icons-extended/build.gradle.kts b/fluent-icons-extended/build.gradle.kts
@@ -2,10 +2,11 @@ plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
     id("com.android.library")
+    id("maven-publish")
 }
 
-group = "com.konyaco.fluent"
-version = "0.0.1-dev3"
+group = "com.konyaco"
+version = "0.0.1-dev4"
 
 kotlin {
     jvm()
@@ -39,4 +40,25 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-}
+}
+
+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
@@ -2,10 +2,11 @@ plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
     id("com.android.library")
+    id("maven-publish")
 }
 
-group = "com.konyaco.fluent"
-version = "0.0.1-dev3"
+group = "com.konyaco"
+version = "0.0.1-dev4"
 
 kotlin {
     jvm()
@@ -49,4 +50,25 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-}
+}
+
+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/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(
@@ -358,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,
@@ -398,4 +397,4 @@ private fun generateBorders(fillAccent: FillAccentColors, stroke: Stroke, darkMo
             0.9395f to stroke.control.default,
             0.9414f to fillAccent.default
         )
-    )
+    )