Modernize gradle scripts, migrate to TOML version catalog

This commit is contained in:
MM20
2023-10-05 21:54:19 +02:00
parent cb6834f36e
commit 2d5a0bf5a7
49 changed files with 401 additions and 545 deletions
+5 -5
View File
@@ -3,8 +3,8 @@ import java.time.LocalDate
import java.time.format.DateTimeFormatter
plugins {
id("com.android.application")
id("kotlin-android")
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
}
android {
@@ -25,11 +25,11 @@ android {
resources.excludes.add("META-INF/NOTICE.md")
}
compileSdk = sdk.versions.compileSdk.get().toInt()
compileSdk = libs.versions.compileSdk.get().toInt()
defaultConfig {
applicationId = "de.mm20.launcher2"
minSdk = sdk.versions.minSdk.get().toInt()
targetSdk = sdk.versions.targetSdk.get().toInt()
minSdk = libs.versions.minSdk.get().toInt()
targetSdk = libs.versions.targetSdk.get().toInt()
@SuppressLint("HighAppVersionCode")
versionCode = System.getenv("VERSION_CODE_OVERRIDE")?.toIntOrNull() ?: 2023090800
versionName = "1.27.1"
+5 -6
View File
@@ -1,15 +1,14 @@
plugins {
id("com.android.library")
id("kotlin-android")
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
}
android {
compileSdk = sdk.versions.compileSdk.get().toInt()
compileSdk = libs.versions.compileSdk.get().toInt()
defaultConfig {
minSdk = sdk.versions.minSdk.get().toInt()
targetSdk = sdk.versions.targetSdk.get().toInt()
minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
signingConfig = signingConfigs.getByName("debug")
@@ -58,6 +58,7 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalHapticFeedback
import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.res.stringResource
@@ -286,6 +287,7 @@ fun PullDownScaffold(
val keyboardController = LocalSoftwareKeyboardController.current
val gestureManager = LocalGestureDetector.current
val hapticFeedback = LocalHapticFeedback.current
val nestedScrollConnection = remember {
object : NestedScrollConnection {