From 45ab647c6789d71ac9892b9fbc56ae31302997f7 Mon Sep 17 00:00:00 2001
From: kr328 <kr328app@outlook.com>
Date: Sun, 16 May 2021 17:55:47 +0800
Subject: [PATCH] Chore: rename flavor 'open' to 'foss'

---
 app/build.gradle.kts                                  |  6 +++---
 buildSrc/src/main/java/Build.kt                       |  2 +-
 common/build.gradle.kts                               |  5 ++++-
 core/build.gradle.kts                                 | 11 +++++++----
 design/build.gradle.kts                               |  9 ++++++---
 .../kr328/clash/design/OverrideSettingsDesign.kt      |  0
 .../github/kr328/clash/design/component/ProxyMenu.kt  |  0
 design/src/{open => foss}/res/menu/menu_proxy.xml     |  0
 hideapi/build.gradle.kts                              |  5 ++++-
 service/build.gradle.kts                              |  4 ++--
 10 files changed, 27 insertions(+), 15 deletions(-)
 rename design/src/{open => foss}/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt (100%)
 rename design/src/{open => foss}/java/com/github/kr328/clash/design/component/ProxyMenu.kt (100%)
 rename design/src/{open => foss}/res/menu/menu_proxy.xml (100%)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0f88c661..a470243a 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 61112d28..404839f8 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 83f383be..a6f68fda 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 23be9926..604333af 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 85fc9fec..3b692620 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 b41794c7..d29bf1f2 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 173beed9..f34cf54e 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"
-- 
GitLab