From 6461eb8e3e7670c174e3823636d30ef230517b82 Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Sat, 29 Feb 2020 22:39:45 +0000 Subject: [PATCH] SimpleGallery - readd AUM --- metadata/com.simplemobiletools.gallery.pro.yml | 8 ++++---- .../build.patch | 18 +----------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/metadata/com.simplemobiletools.gallery.pro.yml b/metadata/com.simplemobiletools.gallery.pro.yml index 633ad7b044..40bf478b03 100644 --- a/metadata/com.simplemobiletools.gallery.pro.yml +++ b/metadata/com.simplemobiletools.gallery.pro.yml @@ -403,9 +403,9 @@ Builds: - yes prebuild: sed -i -e '/keystore/d' build.gradle - - versionName: 6.13.1-foss + - versionName: 6.13.1 versionCode: 296 - commit: 86d26f69fc4f405b28fa16b8e6d5de9edcd24830 + commit: 226374599de4f994d1d5b70931a7f21a6eb9f124 subdir: app patch: - build.patch @@ -413,7 +413,7 @@ Builds: - foss prebuild: sed -i -e '/(is_proprietary)/,+2d' ../build.gradle -AutoUpdateMode: None +AutoUpdateMode: Version %v UpdateCheckMode: Tags -CurrentVersion: 6.13.1-foss +CurrentVersion: 6.13.1 CurrentVersionCode: 296 diff --git a/metadata/com.simplemobiletools.gallery.pro/build.patch b/metadata/com.simplemobiletools.gallery.pro/build.patch index ac288a428d..29b4d880ce 100644 --- a/metadata/com.simplemobiletools.gallery.pro/build.patch +++ b/metadata/com.simplemobiletools.gallery.pro/build.patch @@ -28,7 +28,7 @@ } buildTypes { -@@ -43,25 +29,17 @@ +@@ -43,9 +29,6 @@ release { minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' @@ -38,19 +38,3 @@ } } - sourceSets { - main.java.srcDirs += 'src/main/kotlin' -- if (is_proprietary) { -- main.java.srcDirs += 'src/proprietary/kotlin' -- } - } - - flavorDimensions "licensing" - productFlavors { - proprietary { } - foss { -- // We're not using PhotoEditor here, so changing the name is fine. -- applicationIdSuffix ".foss" - versionNameSuffix "-foss" - } - }