From 65d015b3b3ced9aba03adbc50a8c18f8a4d98324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Mon, 14 Sep 2020 04:25:40 +0000 Subject: [PATCH] Refinds --- TMessagesProj/build.gradle | 22 +++++++--------- TMessagesProj/jni/TgCalls.mk | 7 ++++-- .../org/telegram/messenger/BuildVars.java | 2 +- bin/init_release.sh | 5 ++-- ...ish_release_apks.sh => publish_release.sh} | 0 bin/upload_alaha.sh | 4 --- bin/upload_release.sh | 25 +++++++++++++++++++ build.gradle | 4 +-- gradle/wrapper/gradle-wrapper.properties | 4 +-- 9 files changed, 46 insertions(+), 27 deletions(-) rename bin/{publish_release_apks.sh => publish_release.sh} (100%) create mode 100755 bin/upload_release.sh diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index b50fb0ca6..4d17e44b7 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -5,8 +5,8 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' -def verName = "7.0.1" -def verCode = 67 +def verName = "7.0.1.2" +def verCode = 69 def serviceAccountCredentialsFile = rootProject.file("service_account_credentials.json") @@ -45,7 +45,7 @@ configurations { compile.exclude module: 'support-v4' } -def okHttpVersion = '4.8.1' +def okHttpVersion = '4.9.0' def fcmVersion = '20.2.4' def crashlyticsVersion = '17.2.1' def playCoreVersion = '1.8.0' @@ -73,10 +73,10 @@ repositories { dependencies { - implementation 'androidx.core:core-ktx:1.5.0-alpha02' + implementation 'androidx.core:core-ktx:1.5.0-alpha03' implementation 'androidx.palette:palette-ktx:1.0.0' implementation 'androidx.viewpager:viewpager:1.0.0' - implementation 'androidx.exifinterface:exifinterface:1.2.0' + implementation 'androidx.exifinterface:exifinterface:1.3.0' implementation "androidx.interpolator:interpolator:1.0.0" implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0' implementation 'androidx.multidex:multidex:2.0.1' @@ -86,7 +86,7 @@ dependencies { // TODO: fix problem with android L implementation 'com.google.zxing:core:3.4.0' - compileOnly 'org.checkerframework:checker-qual:3.6.0' + compileOnly 'org.checkerframework:checker-qual:3.6.1' compileOnly 'org.checkerframework:checker-compat-qual:2.5.5' // don't change this :) @@ -96,7 +96,7 @@ dependencies { implementation 'com.stripe:stripe-android:2.0.2' implementation 'com.google.code.gson:gson:2.8.6' implementation 'org.osmdroid:osmdroid-android:6.1.8' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.0' + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9' implementation "com.squareup.okhttp3:okhttp:$okHttpVersion" @@ -104,8 +104,8 @@ dependencies { implementation 'dnsjava:dnsjava:3.2.2' implementation 'org.dizitart:nitrite:3.4.2' - implementation 'cn.hutool:hutool-core:5.4.1' - implementation 'cn.hutool:hutool-crypto:5.4.1' + implementation 'cn.hutool:hutool-core:5.4.3' + implementation 'cn.hutool:hutool-crypto:5.4.3' implementation project(":openpgp-api") @@ -330,10 +330,6 @@ android { } - if (System.getProperty("os.name").toLowerCase().contains("windows")) { - dxUtilPath += ".bat" - } - flavorDimensions "version" productFlavors { diff --git a/TMessagesProj/jni/TgCalls.mk b/TMessagesProj/jni/TgCalls.mk index cf7e0653b..4ccb6e5df 100644 --- a/TMessagesProj/jni/TgCalls.mk +++ b/TMessagesProj/jni/TgCalls.mk @@ -1,3 +1,6 @@ +MY_LOCAL_PATH := $(call my-dir) +LOCAL_PATH := $(MY_LOCAL_PATH) + ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI),x86 x86_64)) include $(CLEAR_VARS) @@ -5,9 +8,9 @@ include $(CLEAR_VARS) LOCAL_MODULE := libvpx_yasm ifeq ($(TARGET_ARCH_ABI),x86) - LOCAL_SRC_FILES := ./third_party/libvpx/source/libvpx/vpx_dsp/x86/libvpx_x86_yasm.a + LOCAL_SRC_FILES := $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vpx_dsp/x86/libvpx_x86_yasm.a else ifeq ($(TARGET_ARCH_ABI),x86_64) - LOCAL_SRC_FILES := ./third_party/libvpx/source/libvpx/vpx_dsp/x86/libvpx_x86_64_yasm.a + LOCAL_SRC_FILES := $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vpx_dsp/x86/libvpx_x86_64_yasm.a endif include $(PREBUILT_STATIC_LIBRARY) diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java b/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java index 13ebc9648..40c0b3585 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java @@ -31,7 +31,7 @@ public class BuildVars { public static String TGX_APP_HASH = "3e0cb5efcd52300aec5994fdfc5bdc16"; public static boolean isUnknown = !BuildConfig.BUILD_TYPE.startsWith("release"); - public static boolean isMini = "mini".equals(BuildConfig.FLAVOR); + public static boolean isMini = BuildConfig.FLAVOR.startsWith("mini"); static { diff --git a/bin/init_release.sh b/bin/init_release.sh index 78ddc15c4..0e045e10e 100755 --- a/bin/init_release.sh +++ b/bin/init_release.sh @@ -2,8 +2,8 @@ function assemble() { - ./gradlew TMessagesProj:assembleRelease \ - TMessagesProj:assembleReleaseNoGcm + ./gradlew TMessagesProj:assembleRelease + ./gradlew TMessagesProj:assembleReleaseNoGcm return $? @@ -12,5 +12,4 @@ function assemble() { #./gradlew TMessagesProj:assembleRelease \ # TMessagesProj:assembleReleaseNoGcm -assemble && assemble \ No newline at end of file diff --git a/bin/publish_release_apks.sh b/bin/publish_release.sh similarity index 100% rename from bin/publish_release_apks.sh rename to bin/publish_release.sh diff --git a/bin/upload_alaha.sh b/bin/upload_alaha.sh index d6e5153b1..0e467e052 100755 --- a/bin/upload_alaha.sh +++ b/bin/upload_alaha.sh @@ -2,10 +2,6 @@ outPath="TMessagesProj/build/outputs/apk/full/release" -#./gradlew TMessagesProj:assembleFullRelease || exit 1 - -rm -f $outPath/*universal* - for apk in $outPath/*.apk; do echo ">> Uploading $apk" diff --git a/bin/upload_release.sh b/bin/upload_release.sh new file mode 100755 index 000000000..d3ad7ccfa --- /dev/null +++ b/bin/upload_release.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +function upload { + + for apk in $outPath/*.apk; do + + echo ">> Uploading $apk" + + curl https://api.telegram.org/bot${TELEGRAM_TOKEN}/sendDocument \ + -X POST \ + -F chat_id="$TELEGRAM_CHANNEL" \ + -F document="@$apk" \ + --silent --show-error --fail >/dev/null + + done + +} + +outPath="TMessagesProj/build/outputs/apk/full/release" + +upload + +outPath="TMessagesProj/build/outputs/apk/full/releaseNoGcm" + +upload \ No newline at end of file diff --git a/build.gradle b/build.gradle index 54e23a761..c14c8f23e 100644 --- a/build.gradle +++ b/build.gradle @@ -8,9 +8,9 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:4.0.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10" classpath 'com.google.gms:google-services:4.3.3' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.1' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0' classpath 'gradle.plugin.org.mozilla.rust-android-gradle:plugin:0.8.3' classpath 'com.github.triplet.gradle:play-publisher:2.8.0' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a2190901c..46a5a8ed9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jul 10 12:31:49 UTC 2020 +#Mon Sep 21 05:52:10 UTC 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip