1
0
mirror of https://github.com/MGislv/NekoX.git synced 2024-06-30 10:14:04 +00:00

Make mini as default flavor

This commit is contained in:
世界 2021-05-18 18:24:06 +08:00
parent c8b67f359c
commit 1c1ebf4c75
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
6 changed files with 5 additions and 32 deletions

View File

@ -464,4 +464,4 @@ jobs:
${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}"
EOF
sed -i -e 's@<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />@@g' TMessagesProj/src/main/AndroidManifest.xml
./gradlew TMessagesProj:publishFullPlayRelease
./gradlew TMessagesProj:publishMiniPlayRelease

View File

@ -324,15 +324,15 @@ android {
productFlavors {
mini {
isDefault true
}
miniAppleEmoji {
}
full {
isDefault true
}
fullAppleEmoji {
}
fullPlay {
miniPlay {
versionNameSuffix "-play"
versionCode verCode - 2
}
@ -443,10 +443,6 @@ dependencies {
testImplementation "org.robolectric:robolectric:4.5.1"
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
if (!targetAbi.isBlank()) {
implementation project(":ss-rust")
implementation project(":ssr-libev")
}
}

View File

@ -1,3 +1,3 @@
#!/bin/bash
./gradlew TMessagesProj:publishFullPlayRelease
./gradlew TMessagesProj:publishMiniPlayRelease

View File

@ -14,5 +14,5 @@ rm -rf build/release &&
mkdir -p build/release &&
find TMessagesProj/build/outputs/apk -name "*.apk" -exec cp {} build/release \; &&
rm -f build/release/*-debug.apk &&
rm -f build/release/*fullPlay*.apk &&
rm -f build/release/*miniPlay*.apk &&
ghr -delete -n "$1" "$1" build/release

View File

@ -6,6 +6,3 @@ source "bin/init/env.sh"
# Native dependencies
bin/init/libs/ffmpeg.sh
bin/init/libs/boringssl.sh
# Build v2ray-core
bin/libs/v2ray/build.sh

View File

@ -2,29 +2,9 @@
source "bin/init/env.sh"
## Install rust
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain none -y
source $HOME/.cargo/env
rustup install $(cat ss-rust/src/main/rust/shadowsocks-rust/rust-toolchain)
rustup target install armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android
echo "rust.rustcCommand=$HOME/.cargo/bin/rustc" >>local.properties
echo "rust.cargoCommand=$HOME/.cargo/bin/cargo" >>local.properties
echo "rust.pythonCommand=/usr/bin/python3" >>local.properties
# Install Golang
curl -o golang.tar.gz https://storage.googleapis.com/golang/go1.16.linux-amd64.tar.gz
mkdir "$HOME/.go"
tar -C "$HOME/.go" --strip-components=1 -xzf golang.tar.gz
rm golang.tar.gz
export PATH="$PATH:$HOME/.go/bin"
go version || exit 1
echo "sdk.dir=$ANDROID_HOME" >>local.properties
echo "ndk.dir=$ANDROID_NDK_HOME" >>local.properties
bin/libs/v2ray/init.sh
## Remove unused non-free dependencies
pushd TMessagesProj