Skip to content

Commit

Permalink
Merge pull request #2 from taehwandev/1-Compose-Version-change
Browse files Browse the repository at this point in the history
#1 compose version change.
  • Loading branch information
taehwandev committed Jan 12, 2023
2 parents 3fb2334 + bbc1c12 commit 647404c
Show file tree
Hide file tree
Showing 9 changed files with 185 additions and 49 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,28 @@ If you register the modifier, the keyboard closes when you touch the background,

## Download

Use gradle - compose 1.3.2, foundation 1.3.1, compose compiler 1.3.2, kotlin 1.7.20
Use gradle - compose 1.3.3, foundation 1.3.1, compose compiler 1.3.2, kotlin 1.7.20

```groovy
implementation "tech.thdev:extensions-compose-keyboard-state:1.3.2"
implementation "tech.thdev:extensions-compose-keyboard-state:1.3.3"
```

Use gradle.kts

```kotlin
implementation("tech.thdev:extensions-compose-keyboard-state:1.3.2")
implementation("tech.thdev:extensions-compose-keyboard-state:1.3.3")
```

Use gradle - compose 1.4.0-alpha03, compose compiler 1.4.0-alpha02, kotlin 1.7.21
Use gradle - compose 1.4.0-alpha04, compose compiler 1.4.0-alpha02, kotlin 1.7.21

```groovy
implementation "tech.thdev:extensions-compose-keyboard-state:1.4.0-alpha03"
implementation "tech.thdev:extensions-compose-keyboard-state:1.4.0-alpha04"
```

Use gradle.kts

```kotlin
implementation("tech.thdev:extensions-compose-keyboard-state:1.4.0-alpha03")
implementation("tech.thdev:extensions-compose-keyboard-state:1.4.0-alpha04")
```

Release version are available in [Sonatyp's repository.](https://search.maven.org/search?q=tech.thdev)
Expand Down
14 changes: 13 additions & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
## 1.0.0
## 1.3.3, 1.4.0-alpha04

- Base - compose last release version
- compose 1.3.3
- compose.foundation 1.3.1
- compose compiler 1.3.2
- kotlin 1.7.20
- Base - compose last alpha
- compose 1.4.0-alpha04
- compose compiler 1.4.0-alpha02
- kotlin 1.7.21

## 1.3.2, 1.4.0-alpha03

- Modifier for handling keyboard state.
- Base - compose last release version
Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ android {
dependencies {
implementation(libs.kotlin.stdlib)

implementation(libs.androidx.coreKtx)
implementation(libs.androidx.core)
implementation(libs.google.material)

implementation(libs.compose.activity)
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
val compileKotlin: org.jetbrains.kotlin.gradle.tasks.KotlinCompile by tasks
compileKotlin.kotlinOptions {
jvmTarget = "1.8"
// languageVersion = libs.versions.kotlin.get()
// languageVersion = libs.versions.composeKotlin.get()
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package tech.thdev.gradle.dependencies

object Publish {
private const val isReleaseVersion = false
val libraryVersion: String
get() = "1.3.2".takeIf { isReleaseVersion } ?: "1.4.0-alpha03"
const val description = "Android Compose keyboard state modifier."
const val publishUrl = "https://thdev.tech/ComposeKeyboardState/"
}
4 changes: 3 additions & 1 deletion extensions-compose-keyboard-state/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@file:Suppress("UnstableApiUsage")

import tech.thdev.gradle.dependencies.Publish

plugins {
Expand All @@ -7,7 +9,7 @@ plugins {
}

ext["libraryName"] = "extensions-compose-keyboard-state"
ext["libraryVersion"] = Publish.libraryVersion
ext["libraryVersion"] = libs.versions.compose.asProvider().get()
ext["description"] = Publish.description
ext["url"] = Publish.publishUrl

Expand Down
132 changes: 132 additions & 0 deletions gradle/_libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
[versions]
buildToolsVersion = "33.0.0"
compileSdk = "33"
targetSdk = "33"
minSdk = "23"

major = "1"
minor = "0"
hotfix = "0"
versionCode = "1"

## Android gradle plugin
androidGradlePlugin = "7.3.1"

## kotlin
# https://github.com/JetBrains/kotlin
kotlin = "1.7.20"

## Coroutine
# https://github.com/Kotlin/kotlinx.coroutines
coroutines = "1.6.4"

## AndroidX
# https://developer.android.com/jetpack/androidx/releases/annotation
androidx-annotation = "1.5.0"
# https://developer.android.com/jetpack/androidx/releases/core
androidx-core = "1.10.0-alpha01"
# https://developer.android.com/jetpack/androidx/releases/appcompat
androidx-appCompat = "1.7.0-alpha01"
# https://developer.android.com/jetpack/androidx/releases/activity
androidx-activity = "1.7.0-alpha03"
# https://developer.android.com/jetpack/androidx/releases/fragment
androidx-fragment = "1.6.0-alpha04"
# https://developer.android.com/jetpack/androidx/releases/vectordrawable
androidx-vectorDrawable = "1.2.0-beta01"
# https://developer.android.com/jetpack/androidx/releases/lifecycle
androidx-lifecycleVersion = "2.6.0-alpha04"
# https://developer.android.com/jetpack/androidx/releases/multidex
androidx-multiDex = "2.0.1"

## Compose
# https://developer.android.com/jetpack/androidx/releases/compose
compose = "1.3.3"
compose-foundation = "1.3.1"
# https://developer.android.com/jetpack/androidx/releases/compose-kotlin
compose-compilerVersion = "1.3.2"

# https://developer.android.com/jetpack/androidx/releases/compose-material3
compose-material3 = "1.0.1"

## Google
# https://github.com/material-components/material-components-android/releases
google-material = "1.8.0-rc01"

## Test
# https://developer.android.com/jetpack/androidx/releases/test
test-androidx-core = "1.5.0"
test-androidx-runner = "1.5.2"
test-androidx-junit = "1.1.5"
# https://github.com/robolectric/robolectric
test-robolectric = "4.9.2"
# https://github.com/mockito/mockito
test-mockito = "4.11.0"
# https://github.com/mockito/mockito-kotlin
test-mockito-kotlin = "4.1.0"
# https://github.com/mannodermaus/android-junit5
test-junit5 = "5.8.2"

[libraries]
## Kotlin
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }

## Coroutines
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }

## AndroidX
androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidx-annotation" }
androidx-core = { module = "androidx.core:core-ktx", version.ref = "androidx-core" }
androidx-appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appCompat" }
androidx-activity = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity" }
androidx-fragment = { module = "androidx.fragment:fragment-ktx", version.ref = "androidx-fragment" }
androidx-vectorDrawable = { module = "androidx.vectordrawable:vectordrawable", version.ref = "androidx-vectorDrawable" }
androidx-lifecycleCommonJava8 = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "androidx-lifecycleVersion" }
androidx-multiDex = { module = "androidx.multidex:multidex", version.ref = "androidx-multiDex" }

## Compose
compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
compose-uiTooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
compose-uiToolingPreview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose-foundation" }
compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "compose" }
compose-animation = { module = "androidx.compose.animation:animation", version.ref = "compose" }
compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" }
compose-activity = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }

## Google
google-material = { module = "com.google.android.material:material", version.ref = "google-material" }

## Test
test-androidx-core = { module = "androidx.test:core", version.ref = "test-androidx-core" }
test-androidx-runner = { module = "androidx.test:runner", version.ref = "test-androidx-runner" }
test-androidx-junit = { module = "androidx.test.ext:junit", version.ref = "test-androidx-junit" }

## Robolectric
test-robolectric = { module = "org.robolectric:robolectric", version.ref = "test-robolectric" }
test-robolectric-shadowapi = { module = "org.robolectric:shadowapi", version.ref = "test-robolectric" }

## Test coroutine
test-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }

## Test mockito
test-mockito = { module = "org.mockito:mockito-core", version.ref = "test-mockito" }
test-mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "test-mockito" }
test-mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "test-mockito-kotlin" }

## Test junit 5
test-junit5 = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "test-junit5" }
test-junit5-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "test-junit5" }
test-junit5-vintage = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "test-junit5" }
test-junit5-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "test-junit5" }

# plugin
plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
plugin-kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
plugin-androidGradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }

[plugins]
androidLibrary = { id = "com.android.library", version.ref = "androidGradlePlugin" }
androidApp = { id = "com.android.application", version.ref = "androidGradlePlugin" }
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
63 changes: 27 additions & 36 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ versionCode = "1"
## Android gradle plugin
androidGradlePlugin = "7.3.1"

## kotlin
# https://github.com/JetBrains/kotlin
kotlin = "1.7.21"

## Coroutine
# https://github.com/Kotlin/kotlinx.coroutines
coroutines = "1.6.4"
Expand All @@ -20,71 +24,58 @@ coroutines = "1.6.4"
# https://developer.android.com/jetpack/androidx/releases/annotation
androidx-annotation = "1.5.0"
# https://developer.android.com/jetpack/androidx/releases/core
androidx-coreKtx = "1.9.0"
androidx-core = "1.10.0-alpha01"
# https://developer.android.com/jetpack/androidx/releases/appcompat
androidx-appCompat = "1.7.0-alpha01"
# https://developer.android.com/jetpack/androidx/releases/activity
androidx-activity = "1.7.0-alpha02"
androidx-activity = "1.7.0-alpha03"
# https://developer.android.com/jetpack/androidx/releases/fragment
androidx-fragment = "1.6.0-alpha03"
androidx-fragment = "1.6.0-alpha04"
# https://developer.android.com/jetpack/androidx/releases/vectordrawable
androidx-vectorDrawable = "1.2.0-beta01"
# https://developer.android.com/jetpack/androidx/releases/lifecycle
androidx-lifecycleVersion = "2.6.0-alpha03"
androidx-lifecycleVersion = "2.6.0-alpha04"
# https://developer.android.com/jetpack/androidx/releases/multidex
androidx-multiDex = "2.0.1"

## Compose
## kotlin
# https://github.com/JetBrains/kotlin
composeKotlin = "1.7.20"
# https://developer.android.com/jetpack/androidx/releases/compose
composeRelease = "1.3.2"
composeRelease-foundation = "1.3.1"

## Compose alpha
## kotlin
# https://github.com/JetBrains/kotlin
composeAlphaKotlin = "1.7.21"
composeAlpha = "1.4.0-alpha03"

# https://developer.android.com/jetpack/androidx/releases/compose-kotlin
# compose-compilerVersion = "1.3.2"
compose = "1.4.0-alpha04"
# https://developer.android.com/jetpack/androidx/releases/compose-kotlin
compose-compilerVersion = "1.4.0-alpha02"

# https://developer.android.com/jetpack/androidx/releases/compose-material3
compose-material3 = "1.0.1"
compose-material3 = "1.1.0-alpha04"

## Google
# https://github.com/material-components/material-components-android/releases
google-material = "1.8.0-beta01"
google-material = "1.8.0-rc01"

## Test
# https://developer.android.com/jetpack/androidx/releases/test
test-androidx-core = "1.5.0"
test-androidx-runner = "1.5.0"
test-androidx-junit = "1.1.4"
test-androidx-runner = "1.5.2"
test-androidx-junit = "1.1.5"
# https://github.com/robolectric/robolectric
test-robolectric = "4.9"
test-robolectric = "4.9.2"
# https://github.com/mockito/mockito
test-mockito = "4.9.0"
test-mockito = "4.11.0"
# https://github.com/mockito/mockito-kotlin
test-mockito-kotlin = "4.1.0"
# https://github.com/mannodermaus/android-junit5
test-junit5 = "5.8.2"

[libraries]
## Kotlin
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "composeAlphaKotlin" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }

## Coroutines
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }

## AndroidX
androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidx-annotation" }
androidx-coreKtx = { module = "androidx.core:core-ktx", version.ref = "androidx-coreKtx" }
androidx-core = { module = "androidx.core:core-ktx", version.ref = "androidx-core" }
androidx-appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appCompat" }
androidx-activity = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity" }
androidx-fragment = { module = "androidx.fragment:fragment-ktx", version.ref = "androidx-fragment" }
Expand All @@ -93,12 +84,12 @@ androidx-lifecycleCommonJava8 = { module = "androidx.lifecycle:lifecycle-common-
androidx-multiDex = { module = "androidx.multidex:multidex", version.ref = "androidx-multiDex" }

## Compose
compose-ui = { module = "androidx.compose.ui:ui", version.ref = "composeAlpha" }
compose-uiTooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "composeAlpha" }
compose-uiToolingPreview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "composeAlpha" }
compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "composeAlpha" }
compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "composeAlpha" }
compose-animation = { module = "androidx.compose.animation:animation", version.ref = "composeAlpha" }
compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
compose-uiTooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
compose-uiToolingPreview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "compose" }
compose-animation = { module = "androidx.compose.animation:animation", version.ref = "compose" }
compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" }
compose-activity = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }

Expand Down Expand Up @@ -129,12 +120,12 @@ test-junit5-vintage = { module = "org.junit.vintage:junit-vintage-engine", versi
test-junit5-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "test-junit5" }

# plugin
plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "composeAlphaKotlin" }
plugin-kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "composeAlphaKotlin" }
plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
plugin-kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
plugin-androidGradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }

[plugins]
androidLibrary = { id = "com.android.library", version.ref = "androidGradlePlugin" }
androidApp = { id = "com.android.application", version.ref = "androidGradlePlugin" }
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "composeAlphaKotlin" }
kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "composeAlphaKotlin" }
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
2 changes: 2 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@file:Suppress("UnstableApiUsage")

pluginManagement {
repositories {
gradlePluginPortal()
Expand Down

0 comments on commit 647404c

Please sign in to comment.