Merge pull request #26 from donvigo/devices-window

Add AndroidWiFiADBWindow feature.
pedrovgs · Dec 13, 2015 · 2a1973b · 2a1973b
2 parents e67a48c + 5a5cc7b
commit 2a1973b
Show file tree

Hide file tree

Showing 31 changed files with 1,526 additions and 194 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ out/
 .idea/
 target/
 *.iml
+local.properties
 
 ### Java ###
 *.class

diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,11 @@
 language: java
 
 script:
-  ./gradlew checkstyle build
+  ./gradlew checkstyle build
+
+jdk: oraclejdk7
+env:
+  matrix:
+  - TERM=dumb
+after_success:
+- ./gradlew test jacocoTestReport coveralls
diff --git a/AndroidWiFiADB.iml b/AndroidWiFiADB.iml
@@ -1,19 +1,146 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="PLUGIN_MODULE" version="4">
+<module external.linked.project.id="AndroidWiFiADB" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.github.pedrovgs" external.system.module.version="1.3-SNAPSHOT" type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/src/main/resources/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
     <orderEntry type="jdk" jdkName="IntelliJ IDEA Community Edition IC-141.2735.5" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: com.jetbrains:android-common:14.1.5" level="project" />
     <orderEntry type="library" name="Gradle: com.jetbrains:android-rt:14.1.5" level="project" />
     <orderEntry type="library" name="Gradle: com.jetbrains:android:14.1.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.jetbrains:mockito-all-1.9.5:14.1.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.jetbrains:junit-4.11:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Gradle: org.mockito:mockito-all:1.10.19" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:annotations:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:asm-all:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:asm-commons:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:asm:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:asm4-all:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:automaton:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:boot:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:bootstrap:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:cglib-2.2.2:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:cli-parser-1.1:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:commons-codec-1.8:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:commons-httpclient-3.1-patched:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:commons-logging-1.1.3:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:commons-net-3.3:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:ecj-4.4:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:extensions:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:fluent-hc-4.3.6:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:forms_rt:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:freemarker:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:groovy-all-2.3.9:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:gson-2.3:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:guava-17.0:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:hamcrest-core-1.3:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:hamcrest-library-1.3:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:httpclient-4.3.6:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:httpcore-4.3.3:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:httpmime-4.3.6:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:icons:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:idea:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:idea_rt:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:isorelax:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:javac2:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jaxen-1.1.3:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jayatana-1.2.4:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jcip-annotations:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jdkAnnotations:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jdom:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jgoodies-common-1.2.1:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jgoodies-forms:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jgoodies-looks-2.4.2:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jh:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jing:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jna-utils:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jna:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jps-launcher:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jps-model:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jps-server:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jsch-0.1.51:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jsch.agentproxy.connector-factory:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jsch.agentproxy.core:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jsch.agentproxy.pageant:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jsch.agentproxy.sshagent:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jsch.agentproxy.usocket-jna:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jsch.agentproxy.usocket-nc:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jsr166e:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jsr173_1.0_api:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:junit-4.11:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:junit:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jzlib-1.1.1:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:log4j:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:markdown4j-2.2:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:markdownj-core-0.4.2-SNAPSHOT:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:microba:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:miglayout-swing:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:nanoxml-2.2.3:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:nekohtml-1.9.14:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:netty-all-4.1.0.Beta4:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:openapi:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:optimizedFileManager:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:oromatcher:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:picocontainer:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:protobuf-2.5.0:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:proxy-vole_20131209:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:pty4j-0.4.22:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:purejavacomm:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:resolver:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:resources:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:resources_en:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:rhino-js-1_7R4:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:rngom-20051226-patched:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:sanselan-0.98-snapshot:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:serviceMessages:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:slf4j-api-1.7.10:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:slf4j-log4j12-1.7.10:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:snappy-in-java-0.3.1:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:swingx-core-1.6.2:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:trang-core:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:trove4j:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:trove4j_src:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:util:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:velocity:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:winp-1.21-patched:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:xbean:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:xerces:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:xmlrpc-2.0:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:xpp3-1.1.4-min:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:xstream-1.4.3:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:androidAnnotations:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:asm-5.0.3:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:asm-analysis-5.0.3:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:asm-tree-5.0.3:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:bcpkix-jdk15on-1.48:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:bcprov-jdk15on-1.48:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:builder-model-1.1.0-rc1:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:common:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:commons-compress-1.0:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:freemarker-2.3.20:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:GoogleFeedback:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:gson-2.2.4:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:jarutils:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:javawriter-2.2.1:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:kxml2-2.3.0:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:layoutlib-api:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:lombok-ast-0.2.3:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:manifest-merger:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:mockito-all-1.9.5:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:sdk-common:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:sdk-tools:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:sdklib:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: com.jetbrains:tools:14.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.jetbrains:resources_en:14.1.5" level="project" />
   </component>
 </module>
diff --git a/README.md b/README.md
@@ -12,11 +12,13 @@ Screenshots
 -----------
 
 ![Android WiFi ADB Usage][2]
+![Android Devices Window][7]
 
 Usage
 -----
 
 Connect your device to your computer using a USB cable. Then press the button and disconnect your USB once the plugin connects your device over WiFi. You can now deploy, run and debug your device using your WiFi connection. Remember that your device and your computer have to be in the same WiFi connection.  
+=======
 
 Installation
 ------------
@@ -78,3 +80,4 @@ License
 [4]: https://github.com/mockito/mockito
 [5]: ./art/sampleButton.png
 [6]: https://plugins.jetbrains.com/plugin/7983
+[7]: ./art/android_devices_window.png
diff --git a/art/android_devices_window.png b/art/android_devices_window.png
diff --git a/build.gradle b/build.gradle
@@ -1,10 +1,21 @@
+buildscript {
+  repositories {
+    mavenCentral()
+  }
+  dependencies {
+    classpath "org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.4.0x"
+  }
+}
+
 plugins {
   id "org.jetbrains.intellij" version "0.0.25"
 }
 
 apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'java'
 apply plugin: 'checkstyle'
+apply plugin: 'jacoco'
+apply plugin: 'com.github.kt3k.coveralls'
 
 group 'com.github.pedrovgs'
 version '1.3-SNAPSHOT'
@@ -34,4 +45,17 @@ task checkstyle(type: Checkstyle) {
   exclude '**/gen/**'
 
   classpath = files()
+}
+
+jacoco {
+  toolVersion = "0.7.5.201505241946"
+  reportsDir = file("$buildDir/reports")
+}
+
+jacocoTestReport {
+  reports {
+    html.enabled = true
+    xml.enabled = true
+    csv.enabled = false
+  }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Sep 30 13:40:53 CEST 2015
+#Sat Nov 21 15:24:09 EET 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
diff --git a/gradlew b/gradlew
@@ -42,11 +42,6 @@ case "`uname`" in
     ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -114,6 +109,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ out/ @@
     .idea/
     target/
     *.iml
+    local.properties
     ### Java ###
     *.class
@@ Expand Down @@