diff --git a/app/build.gradle b/app/build.gradle index 7fd52f67..6d847cd7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -70,15 +70,10 @@ android { kotlinOptions { jvmTarget = javaVersion.toString() - useIR = true } buildFeatures { viewBinding true prefab true - compose true - } - composeOptions { - kotlinCompilerExtensionVersion compose_version } } @@ -87,8 +82,6 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) /* Google */ - def lifecycle_version = "2.2.0" - implementation "androidx.core:core-ktx:1.3.2" implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.4' @@ -101,10 +94,6 @@ dependencies { implementation 'androidx.fragment:fragment-ktx:1.3.0' implementation "com.google.dagger:hilt-android:$hilt_version" kapt "com.google.dagger:hilt-android-compiler:$hilt_version" - implementation "androidx.compose.ui:ui:$compose_version" - implementation "androidx.compose.material:material:$compose_version" - implementation "androidx.compose.ui:ui-tooling:$compose_version" - implementation 'androidx.activity:activity-compose:1.3.0-alpha03' implementation 'com.google.android:flexbox:2.0.1' /* Kotlin */ diff --git a/app/src/main/java/emu/skyline/preference/KeyPickerPreference.kt b/app/src/main/java/emu/skyline/preference/KeyPickerPreference.kt index ef731b55..778b366b 100644 --- a/app/src/main/java/emu/skyline/preference/KeyPickerPreference.kt +++ b/app/src/main/java/emu/skyline/preference/KeyPickerPreference.kt @@ -29,5 +29,5 @@ class KeyPickerPreference @JvmOverloads constructor(context : Context, attrs : A } } - override fun onClick() = documentPicker.launch(null) + override fun onClick() = documentPicker.launch(arrayOf("*/*")) } diff --git a/build.gradle b/build.gradle index 4291938e..23ec4c87 100644 --- a/build.gradle +++ b/build.gradle @@ -2,18 +2,19 @@ buildscript { ext { - kotlin_version = '1.4.31' - lifecycle_version = '2.3.0' - hilt_version = '2.32-alpha' - compose_version = '1.0.0-beta01' + kotlin_version = '1.4.30' + lifecycle_version = '2.3.1' + hilt_version = '2.33-beta' + lifecycle_version = '2.3.1' } repositories { google() + jcenter() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0-alpha08' + classpath 'com.android.tools.build:gradle:4.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"