Skip to content

Commit 7ef3528

Browse files
authored
Fix LocalContentColor import, update dependencies and target SDK 36 (#44)
1 parent bb56f75 commit 7ef3528

File tree

16 files changed

+45
-36
lines changed

16 files changed

+45
-36
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Change Log
22

3+
## Version 4.0.8 *(16/06/2024)*
4+
5+
- Update dependencies and target SDK 36
6+
- Fix import for LocalContentColor
7+
38
## Version 4.0.7 *(15/06/2024)*
49

510
- Added `iconTint` and `colors` parameters to `NumberKeyboardAuxButton` to allow

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Add the dependency:
2525

2626
```gradle
2727
dependencies {
28-
implementation 'com.github.davidmigloz:number-keyboard:4.0.7'
28+
implementation 'com.github.davidmigloz:number-keyboard:4.0.8'
2929
}
3030
```
3131

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ buildscript {
99
apply from: 'dependencies.gradle'
1010
classpath "com.android.tools.build:gradle:$androidGradle"
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin"
12+
classpath "org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:$kotlin"
1213
}
1314
}
1415

configurations.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ext {
44

55
androidConfig = [
66
minSdkVersion : 21,
7-
targetSdkVersion : 34,
8-
compileSdkVersion: 34
7+
targetSdkVersion : 36,
8+
compileSdkVersion: 36
99
]
1010

1111
/**

dependencies.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ ext {
44
//----------------------------------------------------------------------------------------------
55

66
// Android Plugin for Gradle : https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google | https://developer.android.com/studio/releases/gradle-plugin.html#updating-plugin
7-
androidGradle = '8.3.0'
7+
androidGradle = '8.10.1'
88
// Kotlin : https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-gradle-plugin
99
// Kotlin Compose Compatibility Map : https://developer.android.com/jetpack/androidx/releases/compose-kotlin
10-
kotlin = '1.9.22'
11-
// Compose Compiler : https://developer.android.com/jetpack/androidx/releases/compose-compiler
12-
composeCompiler = '1.5.10'
10+
kotlin = '2.1.21'
1311

1412
//----------------------------------------------------------------------------------------------
1513
// App Dependencies
1614
//----------------------------------------------------------------------------------------------
1715

1816
// Compose Bill of Materials : https://mvnrepository.com/artifact/androidx.compose/compose-bom
19-
composeBoM = "2024.02.01"
17+
composeBoM = "2025.06.00"
2018
// Compose Navigation : https://developer.android.com/jetpack/compose/navigation
21-
composeNav = '2.7.7'
19+
composeNav = '2.9.0'
20+
// Compose UI Tooling Preview : https://developer.android.com/jetpack/androidx/releases/compose-ui
21+
composeUiToolingPreview = '1.8.2'
2222
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Dec 25 14:32:25 CET 2018
1+
#Mon Jun 16 10:53:25 CEST 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip

lib/build.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
plugins {
22
id 'com.android.library'
33
id 'kotlin-android'
4+
id 'org.jetbrains.kotlin.plugin.compose'
45
}
56

67
ext {
78
versionMajor = 4 // API Changes, adding big new feature, redesign the App
89
versionMinor = 0 // New features in a backwards-compatible manner
9-
versionPatch = 7 // Backwards-compatible bug fixes
10+
versionPatch = 8 // Backwards-compatible bug fixes
1011
versionClassifier = null // Pre-releases (alpha, beta, rc, SNAPSHOT...)
1112
}
1213

@@ -19,10 +20,6 @@ android {
1920
compose true
2021
}
2122

22-
composeOptions {
23-
kotlinCompilerExtensionVersion = composeCompiler
24-
}
25-
2623
kotlin {
2724
jvmToolchain(jvmToolchainVersion)
2825
}

lib/src/main/java/com/davidmiguel/numberkeyboard/NumberKeyboardButton.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
1818
import androidx.compose.ui.hapticfeedback.HapticFeedback
1919
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
2020
import androidx.compose.ui.platform.LocalHapticFeedback
21-
import androidx.compose.ui.platform.LocalContentColor
21+
import androidx.compose.material3.LocalContentColor
2222
import androidx.compose.ui.text.TextStyle
2323
import androidx.compose.ui.unit.dp
2424
import com.davidmiguel.numberkeyboard.listener.NumberKeyboardClickedListener

lib/src/main/java/com/davidmiguel/numberkeyboard/data/NumberKeyboardData.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@file:Suppress("unused", "MemberVisibilityCanBePrivate")
2+
13
package com.davidmiguel.numberkeyboard.data
24

35
import java.text.DecimalFormat

sample/build.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id 'com.android.application'
33
id 'kotlin-android'
4+
id 'org.jetbrains.kotlin.plugin.compose'
45
}
56

67
ext {
@@ -19,10 +20,6 @@ android {
1920
compose true
2021
}
2122

22-
composeOptions {
23-
kotlinCompilerExtensionVersion = composeCompiler
24-
}
25-
2623
kotlin {
2724
jvmToolchain(jvmToolchainVersion)
2825
}
@@ -49,5 +46,5 @@ dependencies {
4946
implementation("androidx.navigation:navigation-compose:$composeNav")
5047
implementation("androidx.compose.material3:material3")
5148
implementation("androidx.compose.material:material-icons-extended")
52-
implementation 'androidx.compose.ui:ui-tooling-preview-android:1.6.3'
49+
implementation("androidx.compose.ui:ui-tooling-preview-android:$composeUiToolingPreview")
5350
}

0 commit comments

Comments
 (0)