Update dependencies (#5)

JamalMulla · Nov 4, 2022 · cdc093c · cdc093c
1 parent 9c59163
commit cdc093c
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 27 deletions.
diff --git a/ComposePrefs3/build.gradle b/ComposePrefs3/build.gradle
@@ -5,11 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk 31
+    compileSdk 33
 
     defaultConfig {
         minSdk 21
-        targetSdk 31
+        targetSdk 33
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -27,21 +27,20 @@ android {
     }
     kotlinOptions {
         jvmTarget = '1.8'
-        useIR = true
     }
     buildFeatures {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion "1.2.0-alpha08"
+        kotlinCompilerExtensionVersion "1.3.2"
     }
     namespace 'com.jamal.composeprefs3'
 }
 
 dependencies {
-    implementation "androidx.compose.ui:ui:1.2.0-beta02"
-    implementation "androidx.compose.material3:material3:1.0.0-alpha12"
-    implementation "androidx.compose.material3:material3-window-size-class:1.0.0-alpha12"
+    implementation "androidx.compose.ui:ui:1.3.0"
+    implementation "androidx.compose.material3:material3:1.0.0"
+    implementation "androidx.compose.material3:material3-window-size-class:1.0.0"
     implementation "androidx.datastore:datastore-preferences:1.0.0"
 }
 
@@ -54,7 +53,7 @@ afterEvaluate {
 
                 groupId = 'com.github.jamalmulla'
                 artifactId = 'ComposePrefs3'
-                version = '1.0.2'
+                version = '1.0.3'
             }
         }
     }

diff --git a/ComposePrefs3/src/main/java/com/jamal/composeprefs3/ui/prefs/EditTextPref.kt b/ComposePrefs3/src/main/java/com/jamal/composeprefs3/ui/prefs/EditTextPref.kt
@@ -38,6 +38,7 @@ import kotlinx.coroutines.launch
  * @param textColor Text colour of the [title] and [summary]
  * @param enabled If false, this Pref cannot be clicked.
  */
+@OptIn(ExperimentalMaterial3Api::class)
 @ExperimentalComposeUiApi
 @Composable
 fun EditTextPref(

diff --git a/app/build.gradle b/app/build.gradle
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk 31
+    compileSdk 33
 
     defaultConfig {
         applicationId "com.jamal.composeprefs3sample"
-        minSdk 23
-        targetSdk 31
+        minSdk 26
+        targetSdk 33
         versionCode 1
         versionName "1.0"
 
@@ -31,13 +31,12 @@ android {
     }
     kotlinOptions {
         jvmTarget = '1.8'
-        useIR = true
     }
     buildFeatures {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.2.0-alpha08"
+        kotlinCompilerExtensionVersion = "1.3.2"
     }
     packagingOptions {
         resources {
@@ -49,20 +48,19 @@ android {
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.6.0'
-    implementation "androidx.compose.ui:ui:1.2.0-beta02"
-    implementation "androidx.compose.material3:material3:1.0.0-alpha12"
-    implementation "androidx.compose.material3:material3-window-size-class:1.0.0-alpha12"
-    implementation "androidx.compose.ui:ui-tooling-preview:1.2.0-beta02"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
-    implementation 'androidx.activity:activity-compose:1.4.0'
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'com.google.android.material:material:1.7.0'
+    implementation "androidx.compose.ui:ui:1.3.0"
+    implementation "androidx.compose.material3:material3:1.0.0"
+    implementation "androidx.compose.material3:material3-window-size-class:1.0.0"
+    implementation "androidx.compose.ui:ui-tooling-preview:1.3.0"
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation 'androidx.activity:activity-compose:1.6.1'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.2.0-beta02"
-    debugImplementation "androidx.compose.ui:ui-tooling:1.2.0-beta02"
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.3.0"
+    debugImplementation "androidx.compose.ui:ui-tooling:1.3.0"
 
     // ComposePrefs library
     implementation project(':ComposePrefs3')

diff --git a/app/src/main/java/com/jamal/composeprefs3sample/SettingsScreen.kt b/app/src/main/java/com/jamal/composeprefs3sample/SettingsScreen.kt
@@ -275,6 +275,7 @@ fun SettingsScreen() {
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun SettingsTopBar() {
     CenterAlignedTopAppBar(

diff --git a/build.gradle b/build.gradle
@@ -6,8 +6,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20"
+        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Dec 26 19:18:50 GMT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME