diff --git a/.gitmodules b/.gitmodules index 00d59c05..978b50d9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "core/src/main/golang/clash"] path = core/src/main/golang/clash url = https://github.com/Kr328/clash.git +[submodule "kaidl"] + path = kaidl + url = https://github.com/Kr328/kaidl.git diff --git a/build.gradle.kts b/build.gradle.kts index 88393c3a..95b058a3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,10 +6,6 @@ allprojects { repositories { google() mavenCentral() - - maven { - url = uri("https://maven.kr328.app") - } } } diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 769d4fac..34e52e50 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -4,7 +4,6 @@ const val roomVersion = "2.3.0" const val ktxVersion = "1.3.2" const val appcompatVersion = "1.2.0" const val muiltprocessVersion = "1.0.0" -const val kaidlVersion = "1.11" const val appcenterVersion = "4.1.1" const val serializationVersion = "1.2.1" const val materialVersion = "1.3.0" diff --git a/kaidl b/kaidl new file mode 160000 index 00000000..963190ac --- /dev/null +++ b/kaidl @@ -0,0 +1 @@ +Subproject commit 963190ac8e01f3ea14911c3fa5b4df622234c4dc diff --git a/service/build.gradle.kts b/service/build.gradle.kts index f34cf54e..15bbd50c 100644 --- a/service/build.gradle.kts +++ b/service/build.gradle.kts @@ -60,14 +60,14 @@ android { } dependencies { - ksp("com.github.kr328.kaidl:kaidl:$kaidlVersion") + ksp(project(":kaidl:kaidl")) kapt("androidx.room:room-compiler:$roomVersion") api(project(":core")) api(project(":common")) implementation(kotlin("stdlib-jdk7")) - implementation("com.github.kr328.kaidl:kaidl-runtime:$kaidlVersion") + implementation(project(":kaidl:kaidl-runtime")) implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion") implementation("androidx.room:room-runtime:$roomVersion") implementation("androidx.room:room-ktx:$roomVersion") diff --git a/settings.gradle.kts b/settings.gradle.kts index a61c880b..a6f35485 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,6 +6,8 @@ include(":service") include(":design") include(":common") include(":hideapi") +include(":kaidl:kaidl") +include(":kaidl:kaidl-runtime") pluginManagement { repositories {