Skip to content

Commit

Permalink
Merge pull request #12 from godaddy/feature/update-compose
Browse files Browse the repository at this point in the history
Update to compose 1.0.1 (android 1.1.0-beta04)
  • Loading branch information
Rebecca Franks authored Jan 5, 2022
2 parents dce1f90 + 61964cb commit 63854e8
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/.idea/
/.gradle
/local.properties
/build/*
10 changes: 5 additions & 5 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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")
}
Expand All @@ -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"
}
Expand All @@ -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") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
18 changes: 8 additions & 10 deletions color-picker/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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")
}
Expand All @@ -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 {
Expand All @@ -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")
}
}
Expand All @@ -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
Expand Down Expand Up @@ -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"])

Expand Down
2 changes: 1 addition & 1 deletion desktop/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 63854e8

Please sign in to comment.