Skip to content

Commit 7eb90ca

Browse files
authored
Merge pull request #1 from xchgeaxeax/xchgeaxeax-modify
update dep to max
2 parents bc8c24a + 9872637 commit 7eb90ca

File tree

9 files changed

+96
-23
lines changed

9 files changed

+96
-23
lines changed

app/build.gradle.kts

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,19 @@ afterEvaluate {
6565

6666
tasks.getByName("clean", type = Delete::class) {
6767
delete(file(geoFilesDownloadDir))
68-
}
68+
}
69+
android {
70+
buildTypes {
71+
getByName("release") {
72+
signingConfig = signingConfigs.getByName("debug")
73+
isMinifyEnabled = true
74+
}
75+
}
76+
compileSdk = 34
77+
buildToolsVersion = "34.0.0"
78+
compileOptions {
79+
sourceCompatibility = JavaVersion.VERSION_17
80+
targetCompatibility = JavaVersion.VERSION_17
81+
}
82+
ndkVersion = "27.0.11902837 rc2"
83+
}

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
1414
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
1515
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
16+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
1617
<uses-permission
1718
android:name="android.permission.QUERY_ALL_PACKAGES"
1819
tools:ignore="QueryAllPackagesPermission" />

build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ subprojects {
3737
applicationId = "com.github.metacubex.clash"
3838
}
3939

40-
minSdk = 21
41-
targetSdk = 31
40+
minSdk = 26
41+
targetSdk = 33
4242

4343
versionName = "2.10.1"
44-
versionCode = 210001
44+
versionCode = 210002
4545

4646
resValue("string", "release_name", "v$versionName")
4747
resValue("integer", "release_code", "$versionCode")
@@ -59,7 +59,7 @@ subprojects {
5959
}
6060
}
6161

62-
ndkVersion = "23.0.7599858"
62+
ndkVersion = "27.0.11902837 rc2"
6363

6464
compileSdkVersion(defaultConfig.targetSdk!!)
6565

common/build.gradle.kts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,16 @@ dependencies {
99
implementation(libs.kotlin.coroutine)
1010
implementation(libs.androidx.core)
1111
}
12+
android{
13+
compileSdk = 34
14+
buildToolsVersion = "34.0.0"
15+
compileOptions {
16+
sourceCompatibility = JavaVersion.VERSION_17
17+
targetCompatibility = JavaVersion.VERSION_17
18+
}
19+
buildTypes {
20+
getByName("release") {
21+
isMinifyEnabled = true
22+
}
23+
}
24+
}

core/build.gradle.kts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ golang {
3535
}
3636

3737
android {
38+
compileSdk = 34
39+
buildToolsVersion = "34.0.0"
40+
compileOptions {
41+
sourceCompatibility = JavaVersion.VERSION_17
42+
targetCompatibility = JavaVersion.VERSION_17
43+
}
44+
3845
productFlavors {
3946
all {
4047
externalNativeBuild {
@@ -52,6 +59,11 @@ android {
5259
path = file("src/main/cpp/CMakeLists.txt")
5360
}
5461
}
62+
buildTypes {
63+
getByName("release") {
64+
isMinifyEnabled = true
65+
}
66+
}
5567
}
5668

5769
dependencies {

design/build.gradle.kts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,16 @@ dependencies {
1919
implementation(libs.androidx.viewpager)
2020
implementation(libs.google.material)
2121
}
22+
android{
23+
compileSdk = 32
24+
buildToolsVersion = "34.0.0"
25+
compileOptions {
26+
sourceCompatibility = JavaVersion.VERSION_17
27+
targetCompatibility = JavaVersion.VERSION_17
28+
}
29+
buildTypes {
30+
getByName("release") {
31+
isMinifyEnabled = true
32+
}
33+
}
34+
}

hideapi/build.gradle.kts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
11
plugins {
22
id("com.android.library")
33
}
4+
android{
5+
compileSdk = 34
6+
buildToolsVersion = "34.0.0"
7+
compileOptions {
8+
sourceCompatibility = JavaVersion.VERSION_17
9+
targetCompatibility = JavaVersion.VERSION_17
10+
}
11+
buildTypes {
12+
getByName("release") {
13+
isMinifyEnabled = true
14+
}
15+
}
16+
}

service/build.gradle.kts

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,24 @@ dependencies {
1919
implementation(libs.androidx.room.ktx)
2020
implementation(libs.kaidl.runtime)
2121
implementation(libs.rikkax.multiprocess)
22-
implementation(platform("com.squareup.okhttp3:okhttp-bom:4.10.0"))
22+
implementation(platform("com.squareup.okhttp3:okhttp-bom:4.12.0"))
2323

2424
// define any required OkHttp artifacts without version
2525
implementation("com.squareup.okhttp3:okhttp")
2626
implementation("com.squareup.okhttp3:logging-interceptor")
2727
}
28-
29-
afterEvaluate {
30-
android {
31-
libraryVariants.forEach {
32-
sourceSets[it.name].kotlin.srcDir(buildDir.resolve("generated/ksp/${it.name}/kotlin"))
33-
sourceSets[it.name].java.srcDir(buildDir.resolve("generated/ksp/${it.name}/java"))
28+
android{
29+
compileSdk = 34
30+
buildToolsVersion = "34.0.0"
31+
compileOptions {
32+
sourceCompatibility = JavaVersion.VERSION_17
33+
targetCompatibility = JavaVersion.VERSION_17
34+
}
35+
buildTypes {
36+
getByName("release") {
37+
isMinifyEnabled = true
3438
}
3539
}
40+
}
41+
afterEvaluate {
3642
}

settings.gradle.kts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ dependencyResolutionManagement {
1919
versionCatalogs {
2020
create("libs") {
2121
val agp = "7.2.1"
22-
val kotlin = "1.7.0"
23-
val ksp = "$kotlin-1.0.6"
22+
val kotlin = "2.0.0"
23+
val ksp = "$kotlin-1.0.22"
2424
val golang = "1.0.4"
25-
val coroutine = "1.7.3"
26-
val coreKtx = "1.8.0"
27-
val activity = "1.5.0"
28-
val fragment = "1.5.0"
29-
val appcompat = "1.4.2"
25+
val coroutine = "1.8.1"
26+
val coreKtx = "1.12.0"
27+
val activity = "1.6.1"
28+
val fragment = "1.5.7"
29+
val appcompat = "1.6.1"
3030
val coordinator = "1.2.0"
31-
val recyclerview = "1.2.1"
32-
val viewpager = "1.0.0"
31+
val recyclerview = "1.3.2"
32+
val viewpager = "1.1.0-alpha01"
3333
val material = "1.6.1"
34-
val serialization = "1.3.3"
34+
val serialization = "1.7.0"
3535
val kaidl = "1.15"
36-
val room = "2.4.2"
36+
val room = "2.6.1"
3737
val multiprocess = "1.0.0"
3838

3939
library("build-android", "com.android.tools.build:gradle:$agp")

0 commit comments

Comments
 (0)