Merge pull request #2 from bitbar/opencv-update

Opencv update
bitbar · Apr 25, 2017 · 2fe904c · 2fe904c
2 parents 8758e8d + 404240a
commit 2fe904c
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 240 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 dependency-reduced-pom.xml
 example/lib/image_recognition_library_test.jar
 target/
-testdroid.properties
 run-tests.sh
 *.zip
 application.ipa
@@ -10,4 +9,5 @@ application.apk
 *.project
 *.settings/
 .DS_Store
-
+*.idea
+*.iml
diff --git a/README.md b/README.md
@@ -40,9 +40,6 @@ Run Appium:
 
 ```
 cd example
-
-# Install OpenCV (change path according to your platform)
-mvn install:install-file -Dfile=lib/linux/opencv/opencv-2413.jar -DgroupId=opencv -DartifactId=opencv -Dversion=2.4.13 -Dpackaging=jar
 	
 # Download the example Android application
 wget https://github.com/bitbar/testdroid-samples/blob/master/apps/builds/BitbarSampleApp.apk -O application.apk

diff --git a/example/lib/linux/opencv/LICENSE b/example/lib/linux/opencv/LICENSE
diff --git a/example/lib/linux/opencv/libopencv_java2413.so b/example/lib/linux/opencv/libopencv_java2413.so
diff --git a/example/lib/linux/opencv/opencv-2413.jar b/example/lib/linux/opencv/opencv-2413.jar
diff --git a/example/lib/mac/opencv/LICENSE b/example/lib/mac/opencv/LICENSE
diff --git a/example/lib/mac/opencv/libopencv_java2413.dylib b/example/lib/mac/opencv/libopencv_java2413.dylib
diff --git a/example/lib/mac/opencv/opencv-2413.jar b/example/lib/mac/opencv/opencv-2413.jar
diff --git a/example/lib/win/opencv/LICENSE b/example/lib/win/opencv/LICENSE
diff --git a/example/lib/win/opencv/opencv-2413.jar b/example/lib/win/opencv/opencv-2413.jar
diff --git a/example/lib/win/opencv/x64/opencv_java2413.dll b/example/lib/win/opencv/x64/opencv_java2413.dll
diff --git a/example/lib/win/opencv/x86/opencv_java2413.dll b/example/lib/win/opencv/x86/opencv_java2413.dll
diff --git a/example/pom.xml b/example/pom.xml
@@ -9,7 +9,7 @@
         <dependency>
             <groupId>com.testdroid</groupId>
             <artifactId>mobile-opencv-image-recognition-library</artifactId>
-            <version>0.2</version>
+            <version>0.3</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>io.appium</groupId>
             <artifactId>java-client</artifactId>
-            <version>4.1.2</version>
+            <version>5.0.0-BETA7</version>
         </dependency>
         <dependency>
             <groupId>com.testdroid</groupId>

diff --git a/library/pom.xml b/library/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.testdroid</groupId>
     <artifactId>mobile-opencv-image-recognition-library</artifactId>
-    <version>0.2</version>
+    <version>0.3</version>
     <packaging>jar</packaging>
     <name>OpenCV Mobile Image Recognition Library</name>
     <description>Library for image recognition that can be used in mobile testing with for example Appium</description>
@@ -43,31 +43,21 @@
             <artifactId>logback-classic</artifactId>
             <version>1.1.7</version>
         </dependency>
-        <dependency>
-            <groupId>io.appium</groupId>
-            <artifactId>java-client</artifactId>
-            <version>4.1.2</version>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>1.7.4</version>
         </dependency>
         <dependency>
-            <groupId>opencv</groupId>
+            <groupId>org.openpnp</groupId>
             <artifactId>opencv</artifactId>
-            <version>2.4.13</version>
+            <version>3.2.0-1</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
             <version>20151123</version>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>