Merge pull request vx#105 from kruton/master

Update to library-based build

Author: kruton

.idea/gradle.xml

@@ -87,7 +87,12 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="jzlib-1.1.3" level="project" />
+    <orderEntry type="library" exported="" name="sshlib-2.2.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="jsocks-1.0.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
   </component>
-</module>
+</module>

app/app.iml

@@ -3,6 +3,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.github.kt3k.coveralls'
 apply from: '../config/quality.gradle'
 apply from: '../config/translations.gradle'
+apply from: '../config/jacoco.gradle'
 
 buildscript {
     repositories {
@@ -11,6 +12,24 @@ buildscript {
 
     dependencies {
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.0.1x'
+        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
+    }
+}
+
+repositories {
+    maven {
+        url 'https://dl.bintray.com/connectbot/maven'
+    }
+}
+
+dependencies {
+    compile 'org.connectbot:sshlib:2.2.0'
+
+    testCompile 'junit:junit:4.12'
+    testCompile('org.robolectric:robolectric:3.0') {
+        exclude group: 'commons-logging', module: 'commons-logging'
+        exclude group: 'org.apache.httpcomponents', module: 'httpclient'
     }
 }
 
@@ -22,10 +41,6 @@ android {
         applicationId "org.connectbot"
         minSdkVersion 4
         targetSdkVersion 22
-        compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_5
-            targetCompatibility JavaVersion.VERSION_1_5
-        }
 
         ndk {
             moduleName "com_google_ase_Exec"
@@ -46,7 +61,7 @@ android {
     }
 
     dependencies {
-        compile "com.android.support:support-v4:22.2.+"
+        compile "com.android.support:support-v4:22.2.1"
     }
 
     buildTypes {
@@ -66,56 +81,6 @@ android {
     }
 }
 
-apply plugin: 'jacoco'
-
-// By default, Android Gradle plugin uses JaCoCo version 0.7.1, which works great in JUnit on the JVM.
-// But that will fail on Android Lollipop/ART runtime, which requires 0.7.3 or higher.
-if (rootProject.hasProperty('jacocoVersion')) {
-    android.jacoco.version = rootProject.property('jacocoVersion')
-    jacoco.toolVersion = rootProject.property('jacocoVersion')
-} else {
-    println "Using the default JaCoCo version of: ${jacoco.toolVersion}"
-}
-
-// The built-in jacoco plugin automatically applies itself to all Test tasks
-tasks.withType(Test).whenTaskAdded {
-    it.jacoco.append = false
-    it.jacoco.classDumpFile = file("${project.buildDir}/jacoco/dump")
-}
-
-// These tasks are for generating the coverage report after JUnit+robolectric tests have executed
-tasks.create(name: "jacocoTestDebugReport", type: JacocoReport, dependsOn: "testDebug") {
-    group = "Reporting"
-    description = "Generate Jacoco coverage reports"
-
-    classDirectories = fileTree(
-            dir: "${project.buildDir}/intermediates/classes/debug/",
-            excludes: ['**/R.class',
-                       '**/R$*.class',
-                       '**/*$ViewInjector*.*',
-                       '**/BuildConfig.*',
-                       '**/Manifest*.*']
-    )
-
-    sourceDirectories = files("src/main/java", "src/debug/java")
-    executionData = files("${project.buildDir}/jacoco/testDebug.exec")
-
-    reports {
-        xml.enabled = true
-        html.enabled = true
-    }
-}
-
-coveralls.jacocoReportPath = "${project.buildDir}/reports/jacoco/jacocoTestDebugReport/jacocoTestDebugReport.xml"
-
-dependencies {
-    testCompile 'junit:junit:4.12'
-    testCompile('org.robolectric:robolectric:3.0') {
-        exclude group: 'commons-logging', module: 'commons-logging'
-        exclude group: 'org.apache.httpcomponents', module: 'httpclient'
-    }
-}
-
 if (project.hasProperty('keystorePassword')) {
     android.signingConfigs.release.storeFile file(keystoreFile)
     android.signingConfigs.release.storePassword keystorePassword