Kotlin 2.0.0-RC2 (#4343)

This commit is contained in:
Zongle Wang
2024-04-30 10:03:35 +08:00
committed by GitHub
parent 6f5b85e43b
commit b87e880b92
3 changed files with 13 additions and 14 deletions

1
.gitignore vendored
View File

@@ -10,6 +10,7 @@ WallpaperPicker/.project.properties
bin
.idea
.gradle
.kotlin
local.properties
build
.DS_Store

View File

@@ -7,10 +7,11 @@ plugins {
id 'com.android.library' version "8.3.2" apply false
id 'com.android.test' version '8.3.2' apply false
id 'androidx.baselineprofile' version '1.2.4'
id 'org.jetbrains.kotlin.android' version "1.9.23"
id 'org.jetbrains.kotlin.plugin.parcelize' version "1.9.23"
id 'org.jetbrains.kotlin.plugin.serialization' version "1.9.23"
id "com.google.devtools.ksp" version "1.9.23-1.0.20"
id 'org.jetbrains.kotlin.android' version "2.0.0-RC2"
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0-RC2"
id 'org.jetbrains.kotlin.plugin.parcelize' version "2.0.0-RC2"
id 'org.jetbrains.kotlin.plugin.serialization' version "2.0.0-RC2"
id "com.google.devtools.ksp" version "2.0.0-RC1-1.0.20"
id 'com.google.protobuf' version "0.9.4"
id 'app.cash.licensee' version "1.11.0"
id 'dev.rikka.tools.refine' version "4.4.0"
@@ -165,10 +166,6 @@ android {
resValues true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.12"
}
final def keystorePropertiesFile = rootProject.file("keystore.properties")
def releaseSigning = signingConfigs.debug
if (keystorePropertiesFile.exists()) {

View File

@@ -35,13 +35,14 @@ class LawnchairShortcut {
companion object {
val CUSTOMIZE: SystemShortcut.Factory<LawnchairLauncher?> = SystemShortcut.Factory<LawnchairLauncher?> { activity, itemInfo, originalView ->
if (PreferenceManager2.getInstance(activity).lockHomeScreen.firstBlocking()) {
null
} else {
getAppInfo(activity, itemInfo)?.let { Customize(activity, it, itemInfo, originalView) }
val CUSTOMIZE =
SystemShortcut.Factory { activity: LawnchairLauncher, itemInfo, originalView ->
if (PreferenceManager2.getInstance(activity).lockHomeScreen.firstBlocking()) {
null
} else {
getAppInfo(activity, itemInfo)?.let { Customize(activity, it, itemInfo, originalView) }
}
}
}
private fun getAppInfo(launcher: LawnchairLauncher, itemInfo: ItemInfo): ModelAppInfo? {
if (itemInfo is ModelAppInfo) return itemInfo