From 055208a32cbec1585a6066a340a9ffac0296fdbf Mon Sep 17 00:00:00 2001
From: hsm <hsm@lamia.panaceas.james.local>
Date: Sun, 29 May 2016 17:14:36 +0100
Subject: local build changes

---
 build.gradle                             | 11 +++-----
 gradle.properties                        | 29 --------------------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 sshlib/build.gradle                      | 45 +++++++++++++++++++++++++++-----
 4 files changed, 43 insertions(+), 44 deletions(-)
 delete mode 100644 gradle.properties

diff --git a/build.gradle b/build.gradle
index 989f87c..a98ce68 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,21 +1,16 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         jcenter()
     }
     dependencies {
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.android.tools.build:gradle:1.2.2'
+        classpath 'com.novoda:bintray-release:0.2.7'
     }
 }
 
-plugins {
-  id 'net.researchgate.release' version '2.1.2'
-}
-
 allprojects {
     repositories {
+        mavenLocal()
         jcenter()
     }
 }
diff --git a/gradle.properties b/gradle.properties
deleted file mode 100644
index 63a89f7..0000000
--- a/gradle.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-#Thu, 19 May 2016 22:04:02 -0700
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-
-version=2.2.5-SNAPSHOT
-group=org.connectbot
-description=SSH library used in the ConnectBot app
-
-bintrayUser=dummyUser
-bintrayApiKey=dummyApiKey
-
-officialJdk=oraclejdk7
-gitHubUrl=https\://github.com/connectbot/sshlib
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e76..fd27bdf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip
diff --git a/sshlib/build.gradle b/sshlib/build.gradle
index 976cdde..79fc7b1 100644
--- a/sshlib/build.gradle
+++ b/sshlib/build.gradle
@@ -1,16 +1,49 @@
-plugins {
-    id 'com.jfrog.artifactory' version '4.0.0'
-    id 'com.jfrog.bintray' version '1.6'
-}
+apply plugin: 'com.android.library'
+apply plugin: 'bintray-release' // must be applied after your artifact generating plugin (eg. java / com.android.library)
+apply plugin: 'maven'
 
-apply plugin: 'java'
-apply from: "${rootDir}/publish.gradle"
+group = 'org.connectbot'
+version = '2.2.5-SNAPSHOT-JMM'
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.jcraft:jzlib:1.1.3'
     compile 'org.connectbot:simplesocks:1.0.1'
     compile 'net.vrallev.ecc:ecc-25519-java:1.0.3'
+    //compile 'org.sufficientlysecure:openkeychain-intents:3.0-JMM'
+    compile 'org.sufficientlysecure:openpgp-api:11.0-JMM@aar'
 
     testCompile 'junit:junit:4.12'
 }
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion '21.1.2'
+
+    defaultConfig {
+        minSdkVersion 9
+        targetSdkVersion 22
+        versionName '2.2.5-SNAPSHOT-JMM'
+    }
+    
+    // Do not abort build if lint finds errors
+    lintOptions {
+        abortOnError false
+    }
+}
+
+publish {
+    userOrg = 'connectbot'
+    groupId = 'org.connectbot'
+    artifactId = 'sshlib'
+    version = '2.2.5-SNAPSHOT-JMM'
+    description = 'meh'
+    website = 'http://meh';
+}
+
+
+uploadArchives {
+    repositories {
+	mavenLocal()
+    }
+}
-- 
cgit v1.2.3