Merge pull request #35 from GitLiveApp/exclude_iostests

Exclude the iosTests

Author: nbransby

.github/workflows/gradle.yml

@@ -22,5 +22,13 @@ jobs:
         java-version: 1.8
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
-    - name: Build with Gradle
-      run: ./gradlew allTests
+    - name: All tests excluding iosTest
+      run: ./gradlew cleanTest test  -x compileDebugUnitTestKotlinAndroid -x compileReleaseUnitTestKotlinAndroid -x iosTest
+    - name: Run Android Instrumented Tests
+      uses: reactivecircus/android-emulator-runner@v2
+      with:
+        api-level: 29
+        target: google_apis
+        arch: x86_64
+        profile: Nexus 6
+        script: ./gradlew connectedAndroidTest

build.gradle.kts

@@ -12,10 +12,14 @@ buildscript {
         jcenter()
         google()
         gradlePluginPortal()
+        maven {
+            url = uri("https://plugins.gradle.org/m2/")
+        }
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.4.2")
+        classpath("com.android.tools.build:gradle:3.6.1")
         classpath("de.undercouch:gradle-download-task:4.0.4")
+        classpath("com.adarshr:gradle-test-logger-plugin:2.0.0")
     }
 }
 
@@ -43,12 +47,14 @@ subprojects {
 
     group = "dev.gitlive"
 
-
+    apply(plugin="com.adarshr.test-logger")
+    
     repositories {
         mavenLocal()
         mavenCentral()
         google()
         jcenter()
+        
     }
 
     var shouldSign = true

firebase-app/build.gradle.kts

@@ -13,6 +13,7 @@ plugins {
 repositories {
     mavenCentral()
     google()
+    jcenter()
 }
 
 android {

firebase-auth/build.gradle.kts

@@ -4,8 +4,20 @@ plugins {
     id("com.android.library")
     kotlin("multiplatform")
     kotlin("native.cocoapods")
+    //id("com.quittle.android-emulator") version "0.2.0"
 }
 
+//buildscript {
+//    repositories {
+//        jcenter()
+//        google()
+//        gradlePluginPortal()
+//    }
+//    dependencies {
+//        classpath("com.android.tools.build:gradle:3.6.1")
+//    }
+//}
+
 android {
     compileSdkVersion(property("targetSdkVersion") as Int)
     defaultConfig {
@@ -31,6 +43,19 @@ android {
     }
 }
 
+// Optional configuration
+//androidEmulator {
+//    emulator {
+//        name("givlive_emulator")
+//        sdkVersion(28)
+//        abi("x86_64")
+//        includeGoogleApis(true) // Defaults to false
+//
+//    }
+//    headless(false)
+//    logEmulatorOutput(false)
+//}
+
 kotlin {
     js {
         val main by compilations.getting {

firebase-common/build.gradle.kts

@@ -29,6 +29,8 @@ android {
     }
     packagingOptions {
         pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")
+        pickFirst("META-INF/AL2.0")
+        pickFirst("META-INF/LGPL2.1")
     }
 }
 

firebase-database/build.gradle.kts

@@ -24,6 +24,8 @@ android {
     }
     packagingOptions {
         pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")
+        pickFirst("META-INF/AL2.0")
+        pickFirst("META-INF/LGPL2.1")
     }
 }
 

firebase-firestore/build.gradle.kts

@@ -11,6 +11,7 @@ android {
     defaultConfig {
         minSdkVersion(property("minSdkVersion") as Int)
         targetSdkVersion(property("targetSdkVersion") as Int)
+        setMultiDexEnabled(true)
     }
     sourceSets {
         getByName("main") {
@@ -24,6 +25,9 @@ android {
     }
     packagingOptions {
         pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")
+        pickFirst("META-INF/AL2.0")
+        pickFirst("META-INF/LGPL2.1")
+        pickFirst("androidsupportmultidexversion.txt")
     }
 }
 
@@ -59,6 +63,7 @@ kotlin {
         val androidMain by getting {
             dependencies {
                 api("com.google.firebase:firebase-firestore:21.4.3")
+                implementation("com.android.support:multidex:1.0.3")
             }
         }
 

firebase-functions/build.gradle.kts

@@ -24,6 +24,8 @@ android {
     }
     packagingOptions {
         pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")
+        pickFirst("META-INF/AL2.0")
+        pickFirst("META-INF/LGPL2.1")
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Oct 04 15:43:21 BST 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+#Wed May 20 18:31:34 BST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip