Merge branch 'apkFlavor' into 'master'

New com.jens.automation2 test case

See merge request fdroid/fdroidserver!880

MANIFEST.in

@@ -730,6 +730,7 @@ include tests/source-files/com.integreight.onesheeld/quickReturnHeader/build.gra
 include tests/source-files/com.integreight.onesheeld/quickReturnHeader/src/main/AndroidManifest.xml
 include tests/source-files/com.integreight.onesheeld/settings.gradle
 include tests/source-files/com.jens.automation2/build.gradle
+include tests/source-files/com.jens.automation2/app/build.gradle
 include tests/source-files/com.kunzisoft.testcase/build.gradle
 include tests/source-files/com.nextcloud.client/build.gradle
 include tests/source-files/com.nextcloud.client.dev/src/generic/fastlane/metadata/android/en-US/full_description.txt

tests/scanner.TestCase

@@ -48,6 +48,7 @@ class ScannerTest(unittest.TestCase):
             'org.mozilla.rocket': 3,
             'realm': 1,
             'se.manyver': 2,
+            'com.jens.automation2': 2,
         }
         for d in glob.glob(os.path.join(source_files, '*')):
             build = fdroidserver.metadata.Build()
@@ -69,6 +70,7 @@ class ScannerTest(unittest.TestCase):
             ('source-files/osmandapp/osmand/build.gradle', 'free', 5),
             ('source-files/eu.siacs.conversations/build.gradle', 'free', 23),
             ('source-files/org.mozilla.rocket/app/build.gradle', 'focus', 42),
+            ('source-files/com.jens.automation2/app/build.gradle', 'fdroidFlavor', 8),
         ]
 
         for f, flavor, count in test_files:

tests/source-files/com.jens.automation2/app/build.gradle

@@ -0,0 +1,78 @@
+plugins {
+    id 'com.android.application'
+}
+
+android {
+    compileSdkVersion 29
+
+    defaultConfig {
+        applicationId "com.jens.automation2"
+        minSdkVersion 16
+        compileSdkVersion 29
+        buildToolsVersion '29.0.2'
+        useLibrary  'org.apache.http.legacy'
+        versionCode 96
+        versionName "1.6.21"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    lintOptions {
+        checkReleaseBuilds false
+        abortOnError false
+    }
+
+    flavorDimensions "version"
+
+    productFlavors
+            {
+                googlePlayFlavor
+                        {
+                            dimension "version"
+//                            applicationIdSuffix ".googlePlay"
+                            versionNameSuffix "-googlePlay"
+                            targetSdkVersion 29
+                        }
+
+                fdroidFlavor
+                        {
+                            dimension "version"
+//                            applicationIdSuffix ".fdroid"
+                            versionNameSuffix "-fdroid"
+                            targetSdkVersion 28
+                        }
+
+                apkFlavor
+                        {
+                            dimension "version"
+//                            applicationIdSuffix ".apk"
+                            versionNameSuffix "-apk"
+                            targetSdkVersion 28
+                        }
+            }
+}
+
+dependencies {
+    googlePlayFlavorImplementation 'com.google.firebase:firebase-appindexing:19.2.0'
+    googlePlayFlavorImplementation 'com.google.android.gms:play-services-location:17.1.0'
+
+    apkFlavorImplementation 'com.google.firebase:firebase-appindexing:19.2.0'
+    apkFlavorImplementation 'com.google.android.gms:play-services-location:17.1.0'
+
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.google.android.material:material:1.3.0'
+    testImplementation 'junit:junit:4.+'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+}