diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c613efd13..0a5f4352c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -464,4 +464,4 @@ jobs: ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}" EOF sed -i -e 's@@@g' TMessagesProj/src/main/AndroidManifest.xml - ./gradlew TMessagesProj:publishFullPlayRelease \ No newline at end of file + ./gradlew TMessagesProj:publishMiniPlayRelease \ No newline at end of file diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index 994d049a6..70786fa71 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -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") - } } diff --git a/bin/app/play.sh b/bin/app/play.sh index c2369455d..b3e417822 100755 --- a/bin/app/play.sh +++ b/bin/app/play.sh @@ -1,3 +1,3 @@ #!/bin/bash -./gradlew TMessagesProj:publishFullPlayRelease \ No newline at end of file +./gradlew TMessagesProj:publishMiniPlayRelease \ No newline at end of file diff --git a/bin/app/release.sh b/bin/app/release.sh index 95389569c..1e1be8d5f 100755 --- a/bin/app/release.sh +++ b/bin/app/release.sh @@ -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 \ No newline at end of file diff --git a/bin/fdroid/build.sh b/bin/fdroid/build.sh index 7f864c088..ac3679672 100755 --- a/bin/fdroid/build.sh +++ b/bin/fdroid/build.sh @@ -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 diff --git a/bin/fdroid/prebuild.sh b/bin/fdroid/prebuild.sh index 455630bdd..9c46902fe 100755 --- a/bin/fdroid/prebuild.sh +++ b/bin/fdroid/prebuild.sh @@ -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