Merge pull request #54 from sproctor/remove_api

ffgiraldez · web-flow · commit 3ab6b14b729e · 2023-01-17T09:53:14.000+01:00
Update dependencies
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,6 +1,6 @@
 
 plugins {
-    id("org.jetbrains.compose") version "1.1.0"
+    id("org.jetbrains.compose") version "1.2.2"
     id("com.android.application")
     kotlin("android")
 }
@@ -11,18 +11,19 @@ version = "1.0"
 
 dependencies {
     implementation(project(":color-picker"))
-    implementation ("androidx.activity:activity-compose:1.5.1")
-    implementation("com.google.android.material:material:1.6.1")
-    implementation("androidx.navigation:navigation-runtime-ktx:2.5.1")
-    implementation("androidx.navigation:navigation-compose:2.5.2")
+    implementation ("androidx.activity:activity-compose:1.6.1")
+    implementation("com.google.android.material:material:1.7.0")
+    implementation("androidx.navigation:navigation-runtime-ktx:2.5.3")
+    implementation("androidx.navigation:navigation-compose:2.5.3")
+    implementation(compose.material)
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
     defaultConfig {
         applicationId = "com.godaddy.android.colorpicker"
         minSdk = 21
-        targetSdk = 32
+        targetSdk = 33
         versionCode = 1
         versionName = "1.0"
     }
diff --git a/app/src/main/java/com/godaddy/android/colorpicker/ColorPreviewInfo.kt b/app/src/main/java/com/godaddy/android/colorpicker/ColorPreviewInfo.kt
@@ -1,7 +1,6 @@
 package com.godaddy.android.colorpicker
 
 import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -11,9 +10,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.lazy.GridCells
-import androidx.compose.foundation.lazy.LazyVerticalGrid
-import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
@@ -45,7 +44,6 @@ fun ColorPreviewInfo(currentColor: Color) {
     }
 }
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun ColorPaletteBar(
     modifier: Modifier = Modifier,
@@ -54,7 +52,7 @@ fun ColorPaletteBar(
     LazyVerticalGrid(
         horizontalArrangement = Arrangement.spacedBy(4.dp),
         verticalArrangement = Arrangement.spacedBy(4.dp),
-        cells = GridCells.Adaptive(48.dp),
+        columns = GridCells.Adaptive(48.dp),
         modifier = modifier
             .fillMaxWidth(),
         contentPadding = PaddingValues(16.dp),
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,8 +7,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
-        classpath("com.android.tools.build:gradle:7.2.2")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
+        classpath("com.android.tools.build:gradle:7.3.1")
     }
 }
 
diff --git a/color-picker/build.gradle.kts b/color-picker/build.gradle.kts
@@ -2,8 +2,8 @@ import org.jetbrains.compose.compose
 
 plugins {
     kotlin("multiplatform")
-    id("org.jetbrains.dokka") version "1.6.10"
-    id("org.jetbrains.compose") version "1.1.0"
+    id("org.jetbrains.dokka") version "1.7.20"
+    id("org.jetbrains.compose") version "1.2.2"
     id("com.android.library")
     id("maven-publish")
     id("signing")
@@ -24,7 +24,7 @@ kotlin {
             dependencies {
                 api(compose.runtime)
                 api(compose.foundation)
-                api(compose.material)
+                implementation(compose.material)
                 implementation("com.github.ajalt.colormath:colormath:3.2.0")
             }
         }
@@ -33,32 +33,27 @@ kotlin {
                 implementation(kotlin("test"))
             }
         }
-        val androidMain by getting {
-            dependencies {
-                api("androidx.appcompat:appcompat:1.5.1")
-                api("androidx.core:core-ktx:1.8.0")
-            }
-        }
         val androidTest by getting {
             dependencies {
                 implementation("junit:junit:4.13.2")
             }
         }
         val jvmMain by getting {
             dependencies {
-                api(compose.preview)
+                implementation(compose.preview)
             }
         }
         val jvmTest by getting
     }
 }
 
 android {
-    compileSdk = 31
+    namespace = "com.godaddy.common.colorpicker"
+    compileSdk = 33
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = 21
-        targetSdk = 31
+        targetSdk = 33
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
diff --git a/color-picker/src/androidMain/AndroidManifest.xml b/color-picker/src/androidMain/AndroidManifest.xml
diff --git a/color-picker/src/androidMain/kotlin/com/godaddy/android/colorpicker/HsvColorExt.kt b/color-picker/src/androidMain/kotlin/com/godaddy/android/colorpicker/HsvColorExt.kt
@@ -2,7 +2,7 @@
 package com.godaddy.android.colorpicker
 
 /**
- * Converst HsvColor to Android Color Int
+ * Convert HsvColor to Android Color Int
  *
  * returns @ColorInt
  */
diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {
     kotlin("multiplatform")
-    id("org.jetbrains.compose") version "1.1.0"
+    id("org.jetbrains.compose") version "1.2.2"
 }
 
 group = "com.godaddy"
diff --git a/desktop/src/jvmMain/kotlin/HarmonyColorPickerScreen.kt b/desktop/src/jvmMain/kotlin/HarmonyColorPickerScreen.kt
@@ -1,5 +1,4 @@
 import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -8,9 +7,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentHeight
-import androidx.compose.foundation.lazy.GridCells
-import androidx.compose.foundation.lazy.LazyVerticalGrid
-import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.material.DropdownMenu
 import androidx.compose.material.DropdownMenuItem
 import androidx.compose.material.Text
@@ -75,7 +74,6 @@ fun HarmonyColorPickerScreen() {
     }
 }
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun ColorPaletteBar(
     modifier: Modifier = Modifier,
@@ -84,7 +82,7 @@ fun ColorPaletteBar(
     LazyVerticalGrid(
         horizontalArrangement = Arrangement.spacedBy(4.dp),
         verticalArrangement = Arrangement.spacedBy(4.dp),
-        cells = GridCells.Adaptive(48.dp),
+        columns = GridCells.Adaptive(48.dp),
         modifier = modifier
             .fillMaxWidth(),
         contentPadding = PaddingValues(16.dp),
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sun Sep 25 18:37:16 BST 2022
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ buildscript {`
`7`	`7`	`mavenCentral()`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")`
`11`		`- classpath("com.android.tools.build:gradle:7.2.2")`
	`10`	`+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")`
	`11`	`+ classpath("com.android.tools.build:gradle:7.3.1")`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ import org.jetbrains.compose.compose`
`2`	`2`
`3`	`3`	`plugins {`
`4`	`4`	`kotlin("multiplatform")`
`5`		`- id("org.jetbrains.dokka") version "1.6.10"`
`6`		`- id("org.jetbrains.compose") version "1.1.0"`
	`5`	`+ id("org.jetbrains.dokka") version "1.7.20"`
	`6`	`+ id("org.jetbrains.compose") version "1.2.2"`
`7`	`7`	`id("com.android.library")`
`8`	`8`	`id("maven-publish")`
`9`	`9`	`id("signing")`
`@@ -24,7 +24,7 @@ kotlin {`
`24`	`24`	`dependencies {`
`25`	`25`	`api(compose.runtime)`
`26`	`26`	`api(compose.foundation)`
`27`		`- api(compose.material)`
	`27`	`+ implementation(compose.material)`
`28`	`28`	`implementation("com.github.ajalt.colormath:colormath:3.2.0")`
`29`	`29`	`}`
`30`	`30`	`}`
`@@ -33,32 +33,27 @@ kotlin {`
`33`	`33`	`implementation(kotlin("test"))`
`34`	`34`	`}`
`35`	`35`	`}`
`36`		`- val androidMain by getting {`
`37`		`- dependencies {`
`38`		`- api("androidx.appcompat:appcompat:1.5.1")`
`39`		`- api("androidx.core:core-ktx:1.8.0")`
`40`		`- }`
`41`		`- }`
`42`	`36`	`val androidTest by getting {`
`43`	`37`	`dependencies {`
`44`	`38`	`implementation("junit:junit:4.13.2")`
`45`	`39`	`}`
`46`	`40`	`}`
`47`	`41`	`val jvmMain by getting {`
`48`	`42`	`dependencies {`
`49`		`- api(compose.preview)`
	`43`	`+ implementation(compose.preview)`
`50`	`44`	`}`
`51`	`45`	`}`
`52`	`46`	`val jvmTest by getting`
`53`	`47`	`}`
`54`	`48`	`}`
`55`	`49`
`56`	`50`	`android {`
`57`		`- compileSdk = 31`
	`51`	`+ namespace = "com.godaddy.common.colorpicker"`
	`52`	`+ compileSdk = 33`
`58`	`53`	`sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")`
`59`	`54`	`defaultConfig {`
`60`	`55`	`minSdk = 21`
`61`		`- targetSdk = 31`
	`56`	`+ targetSdk = 33`
`62`	`57`	`}`
`63`	`58`	`compileOptions {`
`64`	`59`	`sourceCompatibility = JavaVersion.VERSION_11`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`package com.godaddy.android.colorpicker`
`3`	`3`
`4`	`4`	`/**`
`5`		`- * Converst HsvColor to Android Color Int`
	`5`	`+ * Convert HsvColor to Android Color Int`
`6`	`6`	`*`
`7`	`7`	`* returns @ColorInt`
`8`	`8`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat`
`3`	`3`
`4`	`4`	`plugins {`
`5`	`5`	`kotlin("multiplatform")`
`6`		`- id("org.jetbrains.compose") version "1.1.0"`
	`6`	`+ id("org.jetbrains.compose") version "1.2.2"`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`group = "com.godaddy"`