Merge pull request #12 from godaddy/feature/update-compose

Update to compose 1.0.1 (android 1.1.0-beta04)
godaddy · Jan 5, 2022 · 63854e8 · 63854e8
2 parents dce1f90 + 61964cb
commit 63854e8
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /.idea/
 /.gradle
 /local.properties
+/build/*
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,6 +1,6 @@
 
 plugins {
-    id("org.jetbrains.compose") version "1.0.0-beta5"
+    id("org.jetbrains.compose") version "1.0.1"
     id("com.android.application")
     kotlin("android")
 }
@@ -16,11 +16,11 @@ dependencies {
 }
 
 android {
-    compileSdkVersion(31)
+    compileSdk = 31
     defaultConfig {
         applicationId = "com.godaddy.android.colorpicker"
-        minSdkVersion(21)
-        targetSdkVersion(31)
+        minSdk = 21
+        targetSdk = 31
         versionCode = 1
         versionName = "1.0"
     }
@@ -29,7 +29,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
     packagingOptions {
-        excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        resources.excludes += "/META-INF/{AL2.0,LGPL2.1}"
     }
     buildTypes {
         getByName("release") {

diff --git a/app/src/main/java/com/godaddy/android/colorpicker/SampleColorPickerActivity.kt b/app/src/main/java/com/godaddy/android/colorpicker/SampleColorPickerActivity.kt
@@ -26,9 +26,10 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.godaddy.android.colorpicker.theme.ComposeColorPickerTheme
 
+@ExperimentalGraphicsApi
 class SampleColorPickerActivity : ComponentActivity() {
 
-    @ExperimentalGraphicsApi
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,13 +7,13 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31")
-        classpath("com.android.tools.build:gradle:7.0.3")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
+        classpath("com.android.tools.build:gradle:7.0.4")
     }
 }
 
 group = "com.godaddy"
-version = "1.0"
+version = "0.3.0"
 
 allprojects {
     repositories {

diff --git a/color-picker/build.gradle.kts b/color-picker/build.gradle.kts
@@ -1,12 +1,10 @@
 import org.jetbrains.compose.compose
-import org.jetbrains.kotlin.gradle.plugin.statistics.ReportStatisticsToElasticSearch.password
 
 plugins {
     kotlin("multiplatform")
-    id("org.jetbrains.dokka") version "1.5.30"
-    id("org.jetbrains.compose") version "1.0.0-beta5"
+    id("org.jetbrains.dokka") version "1.6.10"
+    id("org.jetbrains.compose") version "1.0.1"
     id("com.android.library")
-    id("kotlin-android-extensions")
     id("maven-publish")
     id("signing")
 }
@@ -27,7 +25,7 @@ kotlin {
                 api(compose.runtime)
                 api(compose.foundation)
                 api(compose.material)
-                implementation("com.github.ajalt.colormath:colormath:3.1.1")
+                implementation("com.github.ajalt.colormath:colormath:3.2.0")
             }
         }
         val commonTest by getting {
@@ -37,7 +35,7 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                api("androidx.appcompat:appcompat:1.3.1")
+                api("androidx.appcompat:appcompat:1.4.0")
                 api("androidx.core:core-ktx:1.7.0")
             }
         }
@@ -56,11 +54,11 @@ kotlin {
 }
 
 android {
-    compileSdkVersion(31)
+    compileSdk = 31
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
-        minSdkVersion(21)
-        targetSdkVersion(31)
+        minSdk = 21
+        targetSdk = 31
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
@@ -100,7 +98,7 @@ publishing {
     publications.withType(MavenPublication::class) {
         groupId = "com.godaddy.android.colorpicker"
         artifactId = "compose-color-picker"
-        version = "0.2.1"
+        version = "0.3.0"
 
         artifact(tasks["javadocJar"])
 

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.0.0-beta5"
+    id("org.jetbrains.compose") version "1.0.1"
 }
 
 group = "com.godaddy"