commit 787ca9acdd2b8410ed35f1a9a6f03709d7bc1fdf Author: n8fr8 nathan@guardianproject.info Date: Tue Jan 12 12:58:03 2021 -0500

update version code to 1640100100 --- app/build.gradle | 6 +++--- orbotservice/build.gradle | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle index b7210836..a5a79524 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -82,6 +82,8 @@ android { applicationId 'org.torproject.android' targetSdkVersion 29 versionCode 1633300100 + versionCode 1640100100 + versionName getVersionName() archivesBaseName = "Orbot-$versionName" } @@ -129,14 +131,12 @@ dependencies { // Map for the version code that gives each ABI a value. ext.abiCodes = ['armeabi-v7a': '1', 'arm64-v8a': '2', 'mips': '3', 'x86': '4', 'x86_64': '5']

-import com.android.build.OutputFile - // For each APK output variant, override version code of outputs based on ABI codes // ex) 'mips' -> 3xxx // ex) 'x86' -> 4xxx android.applicationVariants.all { variant -> variant.outputs.each { output -> - def baseVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI)) + def baseVersionCode = project.ext.abiCodes.get(output.getFilter(com.android.build.OutputFile.ABI)) if (baseVersionCode != null) { output.versionCodeOverride = Integer.valueOf(variant.versionCode) + Integer.valueOf(baseVersionCode) } diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index d44ef0d8..20f8dd10 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -48,7 +48,7 @@ android {

dependencies {

- implementation 'org.torproject:tor-android-binary:0.4.3.6-actual' + implementation 'org.torproject:tor-android-binary:0.4.4.6'

/** implementation 'info.pluggabletransports.aptds:apt-dispatch-library:1.0.9'