fixed incompatibility with Android Oreo and higher

ns130291 · Nov 1, 2019 · ce9cd7b · ce9cd7b
1 parent cd1efcd
commit ce9cd7b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -9,9 +9,9 @@ Warning: The screen updates are very slow (~1 frame per second).
 ## Usage
 Run with:
 
-    java -jar MonkeyRemote-0.3.jar "PATH TO ADB EXECUTABLE" SCALING_FACTOR
+    java -jar MonkeyRemote-0.4.jar "PATH TO ADB EXECUTABLE" SCALING_FACTOR
 
 so for example:
 
-    java -jar MonkeyRemote-0.3.jar "C:\android-sdk\platform-tools\adb.exe" 0.5
+    java -jar MonkeyRemote-0.4.jar "C:\android-sdk\platform-tools\adb.exe" 0.5
 
diff --git a/pom.xml b/pom.xml
@@ -3,13 +3,25 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.nsvb</groupId>
     <artifactId>MonkeyRemote</artifactId>
-    <version>0.3</version>
+    <version>0.4</version>
     <packaging>jar</packaging>
+    <repositories>
+        <repository>
+            <id>com.google.maven</id>
+            <name>Google Maven Repo</name>
+            <url>https://maven.google.com</url>
+        </repository>
+        <repository>
+            <id>io.spring.repo</id>
+            <name>Spring Maven Repo</name>
+            <url>https://repo.spring.io/plugins-release</url>
+        </repository>
+    </repositories>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
-        <com.android.tools.version>24.3.1</com.android.tools.version>
+        <com.android.tools.version>26.5.1</com.android.tools.version>
     </properties>
     <dependencies>
         <dependency>
@@ -62,6 +74,16 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">

diff --git a/src/main/java/de/nsvb/monkeyremote/MonkeyRemote.java b/src/main/java/de/nsvb/monkeyremote/MonkeyRemote.java
@@ -27,7 +27,7 @@
  */
 public class MonkeyRemote extends JFrame {
 
-    private static final String ADB = "C:\\Users\\ns130291\\Android\\sdk\\platform-tools\\adb.exe";
+    private static final String ADB = "C:\\adb\\adb.exe";
     private static final long TIMEOUT = 5000;
 
     private static float scalingFactor = 0.5f;