Austin/ClashMetaForAndroid
1
0
Fork 0
mirror of https://github.com/MetaCubeX/ClashMetaForAndroid.git synced 2024-11-16 04:22:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove redundant 'Meta'

Browse Source
This commit is contained in:
Larvan2 2024-09-12 02:53:54 +00:00
parent a197f8fce1
commit 43337eacd2
6 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/build-debug.yaml vendored
View File

@ -3,6 +3,9 @@ on:
pull_request: pull_request:
types: [opened, reopened, synchronize] types: [opened, reopened, synchronize]
workflow_dispatch: workflow_dispatch:
push:
branches:
- main
jobs: jobs:
BuildDebug: BuildDebug:
@ -53,7 +56,7 @@ jobs:
- name: Build - name: Build
if: success() if: success()
run: ./gradlew --no-daemon app:assembleMeta-AlphaRelease run: ./gradlew --no-daemon app:assembleAlphaRelease
- name: Upload Aritfact (universal) - name: Upload Aritfact (universal)
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -61,7 +64,7 @@ jobs:
with: with:
name: CMFA Debug Unsigned APK (universal) name: CMFA Debug Unsigned APK (universal)
path: | path: |
app/build/outputs/apk/meta-alpha/release/*-universal-*.apk app/build/outputs/apk/alpha/release/*-universal-*.apk
- name: Upload Aritfact (arm64-v8a) - name: Upload Aritfact (arm64-v8a)
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -69,7 +72,7 @@ jobs:
with: with:
name: CMFA Debug Unsigned APK (arm64-v8a) name: CMFA Debug Unsigned APK (arm64-v8a)
path: | path: |
app/build/outputs/apk/meta-alpha/release/*-arm64-v8a-*.apk app/build/outputs/apk/alpha/release/*-arm64-v8a-*.apk
- name: Upload Aritfact (armeabi-v7a) - name: Upload Aritfact (armeabi-v7a)
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -77,7 +80,7 @@ jobs:
with: with:
name: CMFA Debug Unsigned APK (armeabi-v7a) name: CMFA Debug Unsigned APK (armeabi-v7a)
path: | path: |
app/build/outputs/apk/meta-alpha/release/*-armeabi-v7a-*.apk app/build/outputs/apk/alpha/release/*-armeabi-v7a-*.apk
- name: Upload Aritfact (x86_64) - name: Upload Aritfact (x86_64)
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -85,7 +88,7 @@ jobs:
with: with:
name: CMFA Debug Unsigned APK (x86_64) name: CMFA Debug Unsigned APK (x86_64)
path: | path: |
app/build/outputs/apk/meta-alpha/release/*-x86_64-*.apk app/build/outputs/apk/alpha/release/*-x86_64-*.apk
- name: Upload Aritfact (x86) - name: Upload Aritfact (x86)
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -93,4 +96,4 @@ jobs:
with: with:
name: CMFA Debug Unsigned APK (x86) name: CMFA Debug Unsigned APK (x86)
path: | path: |
app/build/outputs/apk/meta-alpha/release/*-x86-*.apk app/build/outputs/apk/alpha/release/*-x86-*.apk

4
.github/workflows/build-pre-release.yaml vendored
View File

@ -55,7 +55,7 @@ jobs:
- name: Pre-release Build - name: Pre-release Build
if: success() if: success()
run: ./gradlew --no-daemon app:assembleMeta-AlphaRelease run: ./gradlew --no-daemon app:assembleAlphaRelease
# Delete old Prerelease-alpha # Delete old Prerelease-alpha
- uses: dev-drprasad/delete-tag-and-release@v1.1 - uses: dev-drprasad/delete-tag-and-release@v1.1
@ -76,7 +76,7 @@ jobs:
if: ${{ success() }} if: ${{ success() }}
with: with:
tag_name: Prerelease-alpha tag_name: Prerelease-alpha
files: app/build/outputs/apk/meta-alpha/release/* files: app/build/outputs/apk/alpha/release/*
prerelease: true prerelease: true
generate_release_notes: true generate_release_notes: true

8
build.gradle.kts
View File

@ -74,15 +74,15 @@ subprojects {
productFlavors { productFlavors {
flavorDimensions("feature") flavorDimensions("feature")
create("meta-alpha") { create("alpha") {
isDefault = true isDefault = true
dimension = flavorDimensionList[0] dimension = flavorDimensionList[0]
versionNameSuffix = ".Meta-Alpha" versionNameSuffix = ".Alpha"
buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")") buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
if (isApp) { if (isApp) {
applicationIdSuffix = ".meta" applicationIdSuffix = ".alpha"
} }
} }
@ -103,7 +103,7 @@ subprojects {
getByName("meta") { getByName("meta") {
java.srcDirs("src/foss/java") java.srcDirs("src/foss/java")
} }
getByName("meta-alpha") { getByName("alpha") {
java.srcDirs("src/foss/java") java.srcDirs("src/foss/java")
} }
} }

2
core/build.gradle.kts
View File

@ -15,7 +15,7 @@ val golangSource = file("src/main/golang/native")
golang { golang {
sourceSets { sourceSets {
create("meta-alpha") { create("alpha") {
tags.set(listOf("foss","with_gvisor","cmfa")) tags.set(listOf("foss","with_gvisor","cmfa"))
srcDir.set(file("src/foss/golang")) srcDir.set(file("src/foss/golang"))
} }

2
core/src/main/cpp/CMakeLists.txt
View File

@ -33,7 +33,7 @@ string (REGEX REPLACE "[\n\t\r]" "" COMPILE_TIME ${COMPILE_TIME})
string(REGEX REPLACE "\"" "" COMPILE_TIME ${COMPILE_TIME}) string(REGEX REPLACE "\"" "" COMPILE_TIME ${COMPILE_TIME})
# 生成版本信息 # 生成版本信息
set(GIT_VERSION "Meta_${CURRENT_BRANCH}_${COMMIT_HASH}_${COMPILE_TIME}") set(GIT_VERSION "${CURRENT_BRANCH}_${COMMIT_HASH}_${COMPILE_TIME}")
message(STATUS "version info = ${GIT_VERSION}") message(STATUS "version info = ${GIT_VERSION}")
# 去除空格 # 去除空格

2
gradle.properties
View File

@ -6,7 +6,7 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html # http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process. # Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings. # The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx4g -XX:+UseParallelGC -Dfile.encoding=UTF-8 org.gradle.jvmargs=-Xmx4g -XX:+UseZGC -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode. # When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit # This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects