diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0f88c661cee14dd3c7ae06436df16482e5cb02ee..a470243a5dd7ee8123167c8d0b0407239820034d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -38,9 +38,9 @@ android { } productFlavors { - create("open") { - dimension = "open" - versionNameSuffix = ".open-source" + create("foss") { + dimension = "foss" + versionNameSuffix = ".foss" } create("premium") { dimension = "premium" diff --git a/buildSrc/src/main/java/Build.kt b/buildSrc/src/main/java/Build.kt index 61112d281b2a83f5e303b19785a55b43ac869ecf..404839f8f04b0fcce5eda593fc8e9cdcadb28497 100644 --- a/buildSrc/src/main/java/Build.kt +++ b/buildSrc/src/main/java/Build.kt @@ -13,5 +13,5 @@ val Project.buildFlavor: String return if (project(":core").file("src/main/golang/clash/script/script.go").exists()) "premium" else - "open" + "foss" } \ No newline at end of file diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 83f383be0ff411b231b366eecb7a1ec9e5be0cb9..a6f68fdac9f8f7aba6bce234c7303996ad76f710 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -19,7 +19,10 @@ android { buildTypes { named("release") { isMinifyEnabled = false - proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) } } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 23be9926b51e034880991b6cb91c62a52be7531d..604333af729b64f1c233c54fc19033af66026ad7 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -36,7 +36,7 @@ android { arguments( "-DGO_SOURCE:STRING=$golangSource", "-DGO_OUTPUT:STRING=$golangBuild", - "-DFLAVOR_NAME=$buildFlavor" + "-DFLAVOR_NAME=$buildFlavor", ) } } @@ -45,13 +45,16 @@ android { buildTypes { named("release") { isMinifyEnabled = false - proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) } } productFlavors { - create("open") { - dimension = "open" + create("foss") { + dimension = "foss" } create("premium") { dimension = "premium" diff --git a/design/build.gradle.kts b/design/build.gradle.kts index 85fc9fec14360a66d46e0caeac76c3a087625812..3b692620d8e339d78ff19fe44f396a476a8df700 100644 --- a/design/build.gradle.kts +++ b/design/build.gradle.kts @@ -22,13 +22,16 @@ android { buildTypes { named("release") { isMinifyEnabled = false - proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) } } productFlavors { - create("open") { - dimension = "open" + create("foss") { + dimension = "foss" } create("premium") { dimension = "premium" diff --git a/design/src/open/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt b/design/src/foss/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt similarity index 100% rename from design/src/open/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt rename to design/src/foss/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt diff --git a/design/src/open/java/com/github/kr328/clash/design/component/ProxyMenu.kt b/design/src/foss/java/com/github/kr328/clash/design/component/ProxyMenu.kt similarity index 100% rename from design/src/open/java/com/github/kr328/clash/design/component/ProxyMenu.kt rename to design/src/foss/java/com/github/kr328/clash/design/component/ProxyMenu.kt diff --git a/design/src/open/res/menu/menu_proxy.xml b/design/src/foss/res/menu/menu_proxy.xml similarity index 100% rename from design/src/open/res/menu/menu_proxy.xml rename to design/src/foss/res/menu/menu_proxy.xml diff --git a/hideapi/build.gradle.kts b/hideapi/build.gradle.kts index b41794c75a7d2c34069fe3ad458f2c262cfa8377..d29bf1f248147ae224009fc4b119c3e6fc9a30d1 100644 --- a/hideapi/build.gradle.kts +++ b/hideapi/build.gradle.kts @@ -18,7 +18,10 @@ android { buildTypes { named("release") { isMinifyEnabled = false - proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) } } } diff --git a/service/build.gradle.kts b/service/build.gradle.kts index 173beed9fa4c5c726a23d9a57c7393b9a515fc96..f34cf54e31d1ad7b82b1364762b3d12aa3a91b97 100644 --- a/service/build.gradle.kts +++ b/service/build.gradle.kts @@ -32,8 +32,8 @@ android { } productFlavors { - create("open") { - dimension = "open" + create("foss") { + dimension = "foss" } create("premium") { dimension = "premium"