remove preoreo target

Author: mauron85

.circleci/config.yml

@@ -14,7 +14,7 @@ reference:
     working_directory: ~/mauron85_bgloc/android
     docker:
       # specify the version you desire here
-      - image: circleci/android:api-27-alpha
+      - image: circleci/android:api-28-alpha
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
       # documented at https://circleci.com/docs/2.0/circleci-images/

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:3.4.1'
     }
 }
 

android/common

@@ -1,6 +1,5 @@
-#Thu Sep 01 09:25:02 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

android/gradle/wrapper/gradle-wrapper.properties

@@ -18,7 +18,6 @@
 //   buildToolsVersion = "26.0.2"
 //   supportLibVersion = "26.1.0"
 //   googlePlayServicesVersion = "11.8.0"
-//   oreoEXPERIMENTAL = "hellyes"
 // }
 //
 //
@@ -28,20 +27,14 @@
 apply plugin: 'com.android.library'
 
 apply from: '../common/VERSIONS.gradle'
-def playServicesVersion = getPlayServicesVersion()
-def supportLibVersion = getSupportLibVersion()
-def hasGradle3Support = getGradle3Support()
 def hasApp = findProject(':app') != null
 
-def projectFlavor = "preoreo"
-if (rootProject.hasProperty('oreoEXPERIMENTAL')) {
-    projectFlavor = "oreo"
-}
-
 // https://hackernoon.com/android-how-to-add-gradle-dependencies-using-foreach-c4cbcc070458
-def oreoDependencies = [
+def projDependencies = [
     [configuration: "implementation", dependency: libs.slf4j],
     [configuration: "implementation", dependency: libs.reactNative],
+    [configuration: "testImplementation", dependency: testLibs.testRunner],
+    [configuration: "testImplementation", dependency: testLibs.testRules],
     [configuration: "testImplementation", dependency: testLibs.junit],
     [configuration: "testImplementation", dependency: testLibs.powermockMockito],
     [configuration: "testImplementation", dependency: testLibs.powermockjUnit],
@@ -53,20 +46,6 @@ def oreoDependencies = [
     [configuration: "androidTestImplementation", dependency: testLibs.testRules],
 ]
 
-def preoreoDependencies = [
-    [configuration: "compile", dependency: libs.slf4j],
-    [configuration: "compile", dependency: libs.reactNative],
-    [configuration: "testCompile", dependency: testLibs.junit],
-    [configuration: "testCompile", dependency: testLibs.powermockMockito],
-    [configuration: "testCompile", dependency: testLibs.powermockjUnit],
-    [configuration: "testCompile", dependency: testLibs.powermockClassloading],
-    [configuration: "testCompile", dependency: testLibs.mockitoCore],
-    [configuration: "testCompile", dependency: testLibs.festAssertCore],
-    [configuration: "testCompile", dependency: testLibs.robolectric],
-    [configuration: "androidTestCompile", dependency: testLibs.testRunner],
-    [configuration: "androidTestCompile", dependency: testLibs.testRules],
-]
-
 repositories {
     // Google dependencies are now hosted at Maven
     // unfortunately this is ignored when installing as react-native plugin
@@ -83,6 +62,12 @@ android {
         evaluationDependsOn(':app')
     }
 
+    // Tip: https://stackoverflow.com/questions/39987669/renamingdelegatingcontext-is-deprecated-how-do-we-test-sqlite-db-now/52170737#52170737
+    // Gradle automatically adds 'android.test.runner' as a dependency.
+    useLibrary 'android.test.runner'
+    useLibrary 'android.test.base'
+    useLibrary 'android.test.mock'
+
     defaultConfig {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         minSdkVersion project.ext.getMinSdkVersion()
@@ -97,18 +82,9 @@ android {
 }
 
 dependencies {
-    if (hasGradle3Support) {
-        implementation project(path: ':@mauron85_react-native-background-geolocation-common')
-
-        oreoDependencies.each {
-            add(it.configuration, it.dependency)
-        }
-    } else {
-        releaseCompile project(path: ':@mauron85_react-native-background-geolocation-common', configuration: "${projectFlavor}Release")
-        debugCompile project(path: ':@mauron85_react-native-background-geolocation-common', configuration: "${projectFlavor}Debug")
+    implementation project(path: ':@mauron85_react-native-background-geolocation-common')
 
-        preoreoDependencies.each {
-            add(it.configuration, it.dependency)
-        }
+    projDependencies.each {
+        add(it.configuration, it.dependency)
     }
 }

android/lib/build.gradle

@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.SmallTest;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReadableMap;

android/lib/src/androidTest/java/com/marianhello/bgloc/react/ConfigMapperTest.java

@@ -49,6 +49,6 @@ gcloud config set project ${GCLOUD_PROJECT}
 gcloud firebase test android run \
   --type instrumentation \
   --app ${project_dir}/res/dummy.apk \
-  --test $(ls -dt ${project_dir}/android/lib/build/outputs/apk/*.apk | head -1) \
+  --test $(ls -dt ${project_dir}/android/lib/build/outputs/apk/androidTest/debug/*.apk | head -1) \
   --device model=Nexus6,version=25,locale=en,orientation=portrait  \
   --timeout 90s