Skip to content

Commit cdc093c

Browse files
authored
Update dependencies (#5)
1 parent 9c59163 commit cdc093c

6 files changed

Lines changed: 26 additions & 27 deletions

File tree

ComposePrefs3/build.gradle

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ plugins {
55
}
66

77
android {
8-
compileSdk 31
8+
compileSdk 33
99

1010
defaultConfig {
1111
minSdk 21
12-
targetSdk 31
12+
targetSdk 33
1313

1414
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515
consumerProguardFiles "consumer-rules.pro"
@@ -27,21 +27,20 @@ android {
2727
}
2828
kotlinOptions {
2929
jvmTarget = '1.8'
30-
useIR = true
3130
}
3231
buildFeatures {
3332
compose true
3433
}
3534
composeOptions {
36-
kotlinCompilerExtensionVersion "1.2.0-alpha08"
35+
kotlinCompilerExtensionVersion "1.3.2"
3736
}
3837
namespace 'com.jamal.composeprefs3'
3938
}
4039

4140
dependencies {
42-
implementation "androidx.compose.ui:ui:1.2.0-beta02"
43-
implementation "androidx.compose.material3:material3:1.0.0-alpha12"
44-
implementation "androidx.compose.material3:material3-window-size-class:1.0.0-alpha12"
41+
implementation "androidx.compose.ui:ui:1.3.0"
42+
implementation "androidx.compose.material3:material3:1.0.0"
43+
implementation "androidx.compose.material3:material3-window-size-class:1.0.0"
4544
implementation "androidx.datastore:datastore-preferences:1.0.0"
4645
}
4746

@@ -54,7 +53,7 @@ afterEvaluate {
5453

5554
groupId = 'com.github.jamalmulla'
5655
artifactId = 'ComposePrefs3'
57-
version = '1.0.2'
56+
version = '1.0.3'
5857
}
5958
}
6059
}

ComposePrefs3/src/main/java/com/jamal/composeprefs3/ui/prefs/EditTextPref.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import kotlinx.coroutines.launch
3838
* @param textColor Text colour of the [title] and [summary]
3939
* @param enabled If false, this Pref cannot be clicked.
4040
*/
41+
@OptIn(ExperimentalMaterial3Api::class)
4142
@ExperimentalComposeUiApi
4243
@Composable
4344
fun EditTextPref(

app/build.gradle

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ plugins {
44
}
55

66
android {
7-
compileSdk 31
7+
compileSdk 33
88

99
defaultConfig {
1010
applicationId "com.jamal.composeprefs3sample"
11-
minSdk 23
12-
targetSdk 31
11+
minSdk 26
12+
targetSdk 33
1313
versionCode 1
1414
versionName "1.0"
1515

@@ -31,13 +31,12 @@ android {
3131
}
3232
kotlinOptions {
3333
jvmTarget = '1.8'
34-
useIR = true
3534
}
3635
buildFeatures {
3736
compose true
3837
}
3938
composeOptions {
40-
kotlinCompilerExtensionVersion = "1.2.0-alpha08"
39+
kotlinCompilerExtensionVersion = "1.3.2"
4140
}
4241
packagingOptions {
4342
resources {
@@ -49,20 +48,19 @@ android {
4948

5049
dependencies {
5150

52-
implementation 'androidx.core:core-ktx:1.7.0'
53-
implementation 'androidx.appcompat:appcompat:1.4.1'
54-
implementation 'com.google.android.material:material:1.6.0'
55-
implementation "androidx.compose.ui:ui:1.2.0-beta02"
56-
implementation "androidx.compose.material3:material3:1.0.0-alpha12"
57-
implementation "androidx.compose.material3:material3-window-size-class:1.0.0-alpha12"
58-
implementation "androidx.compose.ui:ui-tooling-preview:1.2.0-beta02"
59-
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
60-
implementation 'androidx.activity:activity-compose:1.4.0'
51+
implementation 'androidx.core:core-ktx:1.9.0'
52+
implementation 'com.google.android.material:material:1.7.0'
53+
implementation "androidx.compose.ui:ui:1.3.0"
54+
implementation "androidx.compose.material3:material3:1.0.0"
55+
implementation "androidx.compose.material3:material3-window-size-class:1.0.0"
56+
implementation "androidx.compose.ui:ui-tooling-preview:1.3.0"
57+
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
58+
implementation 'androidx.activity:activity-compose:1.6.1'
6159
testImplementation 'junit:junit:4.+'
6260
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
6361
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
64-
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.2.0-beta02"
65-
debugImplementation "androidx.compose.ui:ui-tooling:1.2.0-beta02"
62+
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.3.0"
63+
debugImplementation "androidx.compose.ui:ui-tooling:1.3.0"
6664

6765
// ComposePrefs library
6866
implementation project(':ComposePrefs3')

app/src/main/java/com/jamal/composeprefs3sample/SettingsScreen.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ fun SettingsScreen() {
275275
}
276276
}
277277

278+
@OptIn(ExperimentalMaterial3Api::class)
278279
@Composable
279280
fun SettingsTopBar() {
280281
CenterAlignedTopAppBar(

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.2.0'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20"
9+
classpath 'com.android.tools.build:gradle:7.3.1'
10+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Sun Dec 26 19:18:50 GMT 2021
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)