From e478dd0537ac077fe9bb83aab793227d6b8e1e4a Mon Sep 17 00:00:00 2001 From: Joao Trindade Date: Sat, 7 Jun 2014 21:39:00 +0100 Subject: [PATCH 1/6] Gradle now supports upload to bintray --- build.gradle | 5 ++++ gradle.properties | 8 ++++++- library/build.gradle | 56 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 65 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 80eec1a..7913dfc 100644 --- a/build.gradle +++ b/build.gradle @@ -13,4 +13,9 @@ allprojects { repositories { mavenCentral() } + + allprojects { + group = 'org.michaelevans.chromahashview' + version = '0.1' + } } diff --git a/gradle.properties b/gradle.properties index 5d08ba7..8d0a72d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,10 @@ # 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 \ No newline at end of file +# org.gradle.parallel=true +bintray_api_base_url=https://api.bintray.com +bintray_repo=android-libs +bintray_package=org.michaelevans.chromehashview + +bintray_username=your_user +bintray_api_key=your_api_key diff --git a/library/build.gradle b/library/build.gradle index c3f99eb..530d0df 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,4 +1,6 @@ apply plugin: 'android-library' +apply plugin: 'maven' + android { compileSdkVersion 19 @@ -8,7 +10,7 @@ android { minSdkVersion 5 targetSdkVersion 19 versionCode 1 - versionName "1.0" + versionName version } buildTypes { release { @@ -18,6 +20,54 @@ android { } } -dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) +// Publish to maven repository + +task sourcesJar(type: Jar) { + classifier 'sources' + from android.sourceSets.main.allSource +} + +artifacts { + archives sourcesJar +} + +uploadArchives { + repositories { + mavenDeployer { + + repository(url: "${bintray_api_base_url}/maven/${bintray_username}/${bintray_repo}/${bintray_package}") { + authentication(userName: bintray_username, password: bintray_api_key) + } + pom.project { + artifactId 'ChromeHashView' + name 'ChromeHashView' + packaging 'jar' + description 'Chroma-Hash is a concept for visualizing secure text input using ambient color bars concept. This library is the Android port' + url 'https://github.com/MichaelEvans/ChromaHashView' + inceptionYear 2014 + + scm { + url 'git@github.com:MichaelEvans/ChromaHashView.git' + connection 'git@github.com:MichaelEvans/ChromaHashView.git' + developerConnection 'git@github.com:MichaelEvans/ChromaHashView.git' + } + + licenses { + license { + name 'Apache License, Version 2.0' + url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + distribution 'repo' + } + } + + developers { + developer { + id 'MichaelEvans' + name 'Michael Evans' + email '' + } + } + } + } + } } From 6c77158a2067cda6c8d9d69860efc5b661a557c0 Mon Sep 17 00:00:00 2001 From: Joao Trindade Date: Sat, 7 Jun 2014 21:41:01 +0100 Subject: [PATCH 2/6] Update gitignore to ignore gradle.properties changes --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f29e858..855291a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,6 @@ build # IntelliJ IDEA .idea *.iml +gradle.properties -.DS_Store \ No newline at end of file +.DS_Store From f39542573ed14fec2f35490b01b6f31dd5a627ce Mon Sep 17 00:00:00 2001 From: Joao Trindade Date: Thu, 10 Jul 2014 00:18:39 +0100 Subject: [PATCH 3/6] Changing folders --- build.gradle | 2 +- demo/build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- library/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 7913dfc..2e55026 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.9.+' + classpath 'com.android.tools.build:gradle:0.10.+' } } diff --git a/demo/build.gradle b/demo/build.gradle index 5fceef9..1b99450 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'android' android { compileSdkVersion 19 - buildToolsVersion "19.0.3" + buildToolsVersion "19.1.0" defaultConfig { minSdkVersion 14 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5de946b..1e61d1f 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=http\://services.gradle.org/distributions/gradle-1.10-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/library/build.gradle b/library/build.gradle index 530d0df..dd66513 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'maven' android { compileSdkVersion 19 - buildToolsVersion "19.0.3" + buildToolsVersion "19.1.0" defaultConfig { minSdkVersion 5 From 8bf148549068bf02496fb9de3006588fdc7e4363 Mon Sep 17 00:00:00 2001 From: Joao Trindade Date: Thu, 10 Jul 2014 00:27:16 +0100 Subject: [PATCH 4/6] Added better instructions to upload to jcenter --- gradle.properties | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8d0a72d..5d2a9a7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,24 +1,7 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Settings specified in this file will override any Gradle settings -# configured through the IDE. - -# 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 bintray_api_base_url=https://api.bintray.com bintray_repo=android-libs bintray_package=org.michaelevans.chromehashview -bintray_username=your_user -bintray_api_key=your_api_key +# Please include these values at USER_HOME/.gradle/gradle.properties. +# bintray_username=you_user +# bintray_api_key=your_api_key From 5f0396942143451019c09dae035f79caf18d02ca Mon Sep 17 00:00:00 2001 From: Joao Trindade Date: Thu, 10 Jul 2014 00:36:15 +0100 Subject: [PATCH 5/6] update build tools t 0.12 --- build.gradle | 2 +- library/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 2e55026..7a10ca5 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.10.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } diff --git a/library/build.gradle b/library/build.gradle index dd66513..cc5571f 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -24,7 +24,7 @@ android { task sourcesJar(type: Jar) { classifier 'sources' - from android.sourceSets.main.allSource + from android.sourceSets.main.java.sourceFiles } artifacts { From 5375753bb4be1a7359770e83fb68b9af247383f6 Mon Sep 17 00:00:00 2001 From: Joao Trindade Date: Thu, 10 Jul 2014 00:37:19 +0100 Subject: [PATCH 6/6] Corrected chrome/chroma --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5d2a9a7..2491464 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ bintray_api_base_url=https://api.bintray.com bintray_repo=android-libs -bintray_package=org.michaelevans.chromehashview +bintray_package=org.michaelevans.chromahashview # Please include these values at USER_HOME/.gradle/gradle.properties. # bintray_username=you_user