mirror of https://github.com/NekoX-Dev/NekoX.git
Refinds
This commit is contained in:
parent
abe7ed624c
commit
18f91daf25
|
@ -7,8 +7,8 @@ apply plugin: 'com.android.application'
|
||||||
apply plugin: 'kotlin-android'
|
apply plugin: 'kotlin-android'
|
||||||
apply plugin: 'kotlin-android-extensions'
|
apply plugin: 'kotlin-android-extensions'
|
||||||
|
|
||||||
def verName = "6.3.0.0-rc03"
|
def verName = "6.3.0.0"
|
||||||
def verCode = 61
|
def verCode = 62
|
||||||
|
|
||||||
def serviceAccountCredentialsFile = rootProject.file("service_account_credentials.json")
|
def serviceAccountCredentialsFile = rootProject.file("service_account_credentials.json")
|
||||||
|
|
||||||
|
@ -47,8 +47,8 @@ configurations {
|
||||||
compile.exclude module: 'support-v4'
|
compile.exclude module: 'support-v4'
|
||||||
}
|
}
|
||||||
|
|
||||||
def okHttpVersion = '4.8.0'
|
def okHttpVersion = '4.8.1'
|
||||||
def fcmVersion = '20.2.3'
|
def fcmVersion = '20.2.4'
|
||||||
def crashlyticsVersion = '17.1.1'
|
def crashlyticsVersion = '17.1.1'
|
||||||
def playCoreVersion = '1.8.0'
|
def playCoreVersion = '1.8.0'
|
||||||
|
|
||||||
|
@ -112,7 +112,6 @@ dependencies {
|
||||||
implementation 'org.tukaani:xz:1.8'
|
implementation 'org.tukaani:xz:1.8'
|
||||||
implementation project(":openpgp-api")
|
implementation project(":openpgp-api")
|
||||||
|
|
||||||
|
|
||||||
compileOnly files('libs/libv2ray.aar')
|
compileOnly files('libs/libv2ray.aar')
|
||||||
|
|
||||||
compileOnly "com.google.firebase:firebase-messaging:$fcmVersion"
|
compileOnly "com.google.firebase:firebase-messaging:$fcmVersion"
|
||||||
|
@ -286,6 +285,7 @@ android {
|
||||||
|
|
||||||
foss {
|
foss {
|
||||||
initWith release
|
initWith release
|
||||||
|
matchingFallbacks = ['debug']
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -640,9 +640,9 @@ public class SharedConfig {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Build.VERSION.SDK_INT < 23) {
|
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
|
||||||
|
|
||||||
throw new RuntimeException(LocaleController.getString("MinApi23Required", R.string.MinApi23Required));
|
throw new RuntimeException(LocaleController.getString("MinApi21Required", R.string.MinApi21Required));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -664,10 +664,8 @@ public class ProxyListActivity extends BaseFragment implements NotificationCente
|
||||||
if (!BuildVars.isMini) {
|
if (!BuildVars.isMini) {
|
||||||
|
|
||||||
addItem.addSubItem(menu_add_input_vmess, LocaleController.getString("AddProxyVmess", R.string.AddProxyVmess)).setOnClickListener((v) -> presentFragment(new VmessSettingsActivity()));
|
addItem.addSubItem(menu_add_input_vmess, LocaleController.getString("AddProxyVmess", R.string.AddProxyVmess)).setOnClickListener((v) -> presentFragment(new VmessSettingsActivity()));
|
||||||
if (Build.VERSION.SDK_INT > 23) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
|
||||||
addItem.addSubItem(menu_add_input_ss, LocaleController.getString("AddProxySS", R.string.AddProxySS)).setOnClickListener((v) -> presentFragment(new ShadowsocksSettingsActivity()));
|
addItem.addSubItem(menu_add_input_ss, LocaleController.getString("AddProxySS", R.string.AddProxySS)).setOnClickListener((v) -> presentFragment(new ShadowsocksSettingsActivity()));
|
||||||
}
|
|
||||||
if (Build.VERSION.SDK_INT >= 21) {
|
|
||||||
addItem.addSubItem(menu_add_input_ssr, LocaleController.getString("AddProxySSR", R.string.AddProxySSR)).setOnClickListener((v) -> presentFragment(new ShadowsocksRSettingsActivity()));
|
addItem.addSubItem(menu_add_input_ssr, LocaleController.getString("AddProxySSR", R.string.AddProxySSR)).setOnClickListener((v) -> presentFragment(new ShadowsocksRSettingsActivity()));
|
||||||
}
|
}
|
||||||
// addItem.addSubItem(menu_add_input_rb, LocaleController.getString("AddProxyRB", R.string.AddProxyRB)).setOnClickListener((v) -> presentFragment(new RelayBatonSettingsActivity()));
|
// addItem.addSubItem(menu_add_input_rb, LocaleController.getString("AddProxyRB", R.string.AddProxyRB)).setOnClickListener((v) -> presentFragment(new RelayBatonSettingsActivity()));
|
||||||
|
|
|
@ -521,6 +521,11 @@ public class NekoGeneralSettingsActivity extends BaseFragment {
|
||||||
|
|
||||||
requestKey(new Intent(OpenPgpApi.ACTION_GET_SIGN_KEY_ID));
|
requestKey(new Intent(OpenPgpApi.ACTION_GET_SIGN_KEY_ID));
|
||||||
|
|
||||||
|
} else if (position == autoPauseVideoRow) {
|
||||||
|
NekoConfig.toggleAutoPauseVideo();
|
||||||
|
if (view instanceof TextCheckCell) {
|
||||||
|
((TextCheckCell) view).setChecked(NekoConfig.autoPauseVideo);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -3,10 +3,12 @@
|
||||||
function assemble() {
|
function assemble() {
|
||||||
|
|
||||||
./gradlew TMessagesProj:assembleFullRelease \
|
./gradlew TMessagesProj:assembleFullRelease \
|
||||||
|
TMessagesProj:assembleFullAppleEmojiRelease \
|
||||||
|
TMessagesProj:assembleFullTwitterEmojiRelease \
|
||||||
|
TMessagesProj:assembleFullFacebookEmojiRelease \
|
||||||
TMessagesProj:assembleFullReleaseNoGcm \
|
TMessagesProj:assembleFullReleaseNoGcm \
|
||||||
TMessagesProj:assembleMiniRelease \
|
TMessagesProj:assembleMiniRelease \
|
||||||
TMessagesProj:assembleMiniReleaseNoGcm \
|
TMessagesProj:assembleMiniReleaseNoGcm \
|
||||||
TMessagesProj:assembleMiniNoEmojiRelease \
|
|
||||||
TMessagesProj:assembleMiniNoEmojiReleaseNoGcm
|
TMessagesProj:assembleMiniNoEmojiReleaseNoGcm
|
||||||
|
|
||||||
return $?
|
return $?
|
||||||
|
@ -17,4 +19,19 @@ function assemble() {
|
||||||
# TMessagesProj:assembleReleaseNoGcm
|
# TMessagesProj:assembleReleaseNoGcm
|
||||||
|
|
||||||
assemble &&
|
assemble &&
|
||||||
assemble
|
assemble &&
|
||||||
|
|
||||||
|
rm -rf build/apks &&
|
||||||
|
mkdir -p build/apks &&
|
||||||
|
find TMessagesProj/build/outputs/apk -name "*.apk" -exec cp {} build/apks \; &&
|
||||||
|
cp build/update.json build/apks &&
|
||||||
|
cd build/apks &&
|
||||||
|
rm *universal* &&
|
||||||
|
xz *.apk &&
|
||||||
|
export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" &&
|
||||||
|
git init &&
|
||||||
|
git config --global user.name "世界" &&
|
||||||
|
git config --global user.email "i@nekox.me" &&
|
||||||
|
git remote add origin "git@github.com:NekoX-Dev/Resources.git" &&
|
||||||
|
git add . --all &&
|
||||||
|
git commit -m "Update"
|
|
@ -4,7 +4,7 @@ if [ ! -x "$(command -v go)" ]; then
|
||||||
|
|
||||||
# if [ ! -x "$(command -v gvm)" ]; then
|
# if [ ! -x "$(command -v gvm)" ]; then
|
||||||
#
|
#
|
||||||
# apt install -y bison
|
# apt install -y bison binutils gcc make
|
||||||
#
|
#
|
||||||
# bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer)
|
# bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer)
|
||||||
#
|
#
|
||||||
|
@ -42,6 +42,23 @@ if [ ! -x "$(command -v cmake)" ]; then
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -z "$ANDROID_HOME" ]; then
|
||||||
|
|
||||||
|
if [ -d "$HOME/Android/Sdk" ]; then
|
||||||
|
|
||||||
|
export ANDROID_HOME=$HOME/Android/Sdk
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
echo "E: ANDROID_HOME not found."
|
||||||
|
|
||||||
|
exit 1
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -f "$ANDROID_HOME/ndk-bundle/source.properties" ]; then
|
if [ -f "$ANDROID_HOME/ndk-bundle/source.properties" ]; then
|
||||||
|
|
||||||
export NDK=$ANDROID_HOME/ndk-bundle
|
export NDK=$ANDROID_HOME/ndk-bundle
|
||||||
|
|
|
@ -1,18 +1,5 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
rm -rf build/apks &&
|
cd
|
||||||
mkdir -p build/apks &&
|
|
||||||
find TMessagesProj/build/outputs/apk -name "*.apk" -exec cp {} build/apks \; &&
|
|
||||||
cp build/update.json build/apks &&
|
|
||||||
cd build/apks &&
|
|
||||||
rm *universal* &&
|
|
||||||
xz *.apk &&
|
|
||||||
export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" &&
|
|
||||||
git init &&
|
|
||||||
git config --global user.name "世界" &&
|
|
||||||
git config --global user.email "i@nekox.me" &&
|
|
||||||
git remote add origin "git@github.com:NekoX-Dev/Resources.git" &&
|
|
||||||
git add . --all &&
|
|
||||||
git commit -m "Update" &&
|
|
||||||
git push origin master -f &&
|
git push origin master -f &&
|
||||||
rm -rf build/apks
|
rm -rf build/apks
|
|
@ -1,6 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
./bin/init_release.sh &&
|
|
||||||
./bin/publish_release_apks.sh "$1" &&
|
|
||||||
./bin/publish_repo_apks.sh &&
|
|
||||||
./bin/publish_play.sh
|
|
|
@ -1,4 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
git tag "$1" -f &&
|
|
||||||
git push origin "$1" -f
|
|
|
@ -33,6 +33,12 @@ if [ ! -x "$(command -v rustc)" ]; then
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -z "$ANDROID_HOME" ]; then
|
||||||
|
if [ -d "$HOME/Android/Sdk" ]; then
|
||||||
|
export ANDROID_HOME="$HOME/Android/Sdk"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ! -f "$ANDROID_HOME/ndk-bundle/source.properties" ]; then
|
if [ ! -f "$ANDROID_HOME/ndk-bundle/source.properties" ]; then
|
||||||
|
|
||||||
export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/21.3.6528147
|
export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/21.3.6528147
|
||||||
|
|
|
@ -11,7 +11,7 @@ android {
|
||||||
|
|
||||||
compileSdkVersion(30)
|
compileSdkVersion(30)
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion(23)
|
minSdkVersion(21)
|
||||||
targetSdkVersion(30)
|
targetSdkVersion(30)
|
||||||
}
|
}
|
||||||
buildToolsVersion = "30.0.1"
|
buildToolsVersion = "30.0.1"
|
||||||
|
|
Loading…
Reference in New Issue