From 2d15c6e4ec43e863bef7b843425e4bfd6d779033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8C=E5=88=BA=E8=9E=88?= Date: Mon, 7 Jul 2025 12:58:18 +0800 Subject: [PATCH] perf: gradle config --- app/build.gradle.kts | 4 +-- settings.gradle.kts | 19 +++++++---- wasm_matches/.gitignore | 1 - wasm_matches/build.gradle.kts | 32 ------------------- .../kotlin/li/songe/matches/toMatches.kt | 10 ------ 5 files changed, 14 insertions(+), 52 deletions(-) delete mode 100644 wasm_matches/.gitignore delete mode 100644 wasm_matches/build.gradle.kts delete mode 100644 wasm_matches/src/commonMain/kotlin/li/songe/matches/toMatches.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 13d234dc..f964ae41 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -215,7 +215,7 @@ composeCompiler { dependencies { implementation(libs.kotlin.stdlib) - implementation(project(mapOf("path" to ":selector"))) + implementation(project(":selector")) implementation(libs.androidx.appcompat) implementation(libs.androidx.core.ktx) @@ -238,7 +238,7 @@ dependencies { androidTestImplementation(libs.androidx.junit) androidTestImplementation(libs.androidx.espresso) - compileOnly(project(mapOf("path" to ":hidden_api"))) + compileOnly(project(":hidden_api")) implementation(libs.rikka.shizuku.api) implementation(libs.rikka.shizuku.provider) implementation(libs.lsposed.hiddenapibypass) diff --git a/settings.gradle.kts b/settings.gradle.kts index 06878a44..ea8e7e97 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,12 +1,12 @@ rootProject.name = "gkd" -include(":app") -include(":selector") -include(":hidden_api") -include(":wasm_matches") +include( + ":app", + ":hidden_api", + ":selector", +) pluginManagement { repositories { - mavenLocal() mavenCentral() google { content { @@ -22,9 +22,14 @@ pluginManagement { dependencyResolutionManagement { repositories { - mavenLocal() mavenCentral() - google() + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } maven("https://jitpack.io") } } diff --git a/wasm_matches/.gitignore b/wasm_matches/.gitignore deleted file mode 100644 index 42afabfd..00000000 --- a/wasm_matches/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/wasm_matches/build.gradle.kts b/wasm_matches/build.gradle.kts deleted file mode 100644 index 6234520e..00000000 --- a/wasm_matches/build.gradle.kts +++ /dev/null @@ -1,32 +0,0 @@ -@file:OptIn(ExperimentalWasmDsl::class) - -import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl -import org.jetbrains.kotlin.gradle.dsl.JvmTarget - -plugins { - alias(libs.plugins.kotlin.multiplatform) -} - -kotlin { - jvm { - compilerOptions { - jvmTarget.set(rootProject.ext["kotlin.jvmTarget"] as JvmTarget) - } - } - wasmJs { - binaries.executable() - useEsModules() - generateTypeScriptDefinitions() - browser {} - } - sourceSets { - all { - languageSettings.optIn("kotlin.js.ExperimentalJsExport") - } - commonMain { - dependencies { - implementation(libs.kotlin.stdlib) - } - } - } -} diff --git a/wasm_matches/src/commonMain/kotlin/li/songe/matches/toMatches.kt b/wasm_matches/src/commonMain/kotlin/li/songe/matches/toMatches.kt deleted file mode 100644 index 8c0c5c77..00000000 --- a/wasm_matches/src/commonMain/kotlin/li/songe/matches/toMatches.kt +++ /dev/null @@ -1,10 +0,0 @@ -package li.songe.matches - -import kotlin.js.JsExport - -// wasm gc -@JsExport -fun toMatches(source: String): (input: String) -> Boolean { - val regex = Regex(source) - return { input -> regex.matches(input) } -} \ No newline at end of file