Merge pull request #2 from wix/master

merge
alimek · Jun 17, 2019 · 2fe394b · 2fe394b
2 parents f89e765 + 030d0b1
commit 2fe394b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-interactable",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0",
   "description": "High performance interactable views in React Native",
   "license": "MIT",
   "author": "Tal Kol <[email protected]>",

diff --git a/playground/android/app/build.gradle b/playground/android/app/build.gradle
@@ -110,8 +110,7 @@ android {
         versionName "1.0"
         testBuildType System.getProperty('testBuildType', 'debug')
 
-        missingDimensionStrategy "minReactNative", "minReactNative46" //read note
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     signingConfigs {
         release {
@@ -159,8 +158,6 @@ dependencies {
 
     androidTestImplementation(project(path: ":detox"))
     androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test:rules:1.0.1'
 }
 
 // Run this once to be able to run the application with BUCK

diff --git a/playground/android/app/src/androidTest/java/com/playground/DetoxTest.java b/playground/android/app/src/androidTest/java/com/playground/DetoxTest.java
@@ -1,16 +1,15 @@
 package com.playground;
 
-import android.support.test.filters.LargeTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.playground.MainActivity;
 import com.wix.detox.Detox;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+
 @RunWith(AndroidJUnit4.class)
 @LargeTest
 public class DetoxTest {
@@ -19,7 +18,7 @@ public class DetoxTest {
     public ActivityTestRule<MainActivity> mActivityRule = new ActivityTestRule<>(MainActivity.class, false, false);
 
     @Test
-    public void runDetoxTests() throws InterruptedException {
+    public void runDetoxTests() {
         Detox.runTests(mActivityRule);
     }
 }
diff --git a/playground/android/build.gradle b/playground/android/build.gradle
@@ -3,6 +3,7 @@
 buildscript {
     repositories {
         google()
+        mavenLocal()
         jcenter()
     }
     dependencies {

diff --git a/scripts/ci.android.sh b/scripts/ci.android.sh
@@ -0,0 +1,4 @@
+yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses
+
+npm install
+npm run e2e:android:ci
diff --git a/scripts/ci.ios.sh b/scripts/ci.ios.sh
@@ -0,0 +1,3 @@
+npm install
+npm run build:ios
+npm run e2e:ios