From f17d34a39cdaf098c6267fc18f9ddfc871d2be64 Mon Sep 17 00:00:00 2001 From: Yarin Date: Wed, 21 Nov 2018 19:49:03 +0200 Subject: [PATCH 1/7] license --- build.gradle | 8 ++++---- gradle.properties | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index fe327739..806ccd32 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { } } plugins { - id "com.jfrog.bintray" version "1.7" + id "com.jfrog.bintray" version "1.+" id 'net.researchgate.release' version '2.3.4' id "com.github.hierynomus.license" version "0.14.0" } @@ -143,7 +143,7 @@ publishing { id 'guy120494' name 'Guy Smorodinsky' } - developer{ + developer { id 'osher-sade' name 'Osher Sade' } @@ -157,8 +157,8 @@ publishing { afterReleaseBuild.dependsOn bintrayUpload bintray { - user = System.getenv('BINTRAY_USER') ?: project.findProperty('BINTRAY_USER') ?: '' - key = System.getenv('BINTRAY_KEY') ?: project.findProperty('BINTRAY_KEY') ?: '' + user = property('user') ?: System.getenv('BINTRAY_USER') ?: project.findProperty('BINTRAY_USER') ?: '' + key = property('key') ?: System.getenv('BINTRAY_KEY') ?: project.findProperty('BINTRAY_KEY') ?: '' publications = ['maven'] publish = true pkg { diff --git a/gradle.properties b/gradle.properties index 34b048be..0502e244 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,6 +5,4 @@ org.gradle.daemon=true org.gradle.parallel=true org.gradle.jvmargs=-Dfile.encoding=UTF-8 -bintray.user=DUMMY_USER -bintray.key=DUMMY_KEY -version = 6.1 +version = 6.1.1 From 485e4859e759c7b3f2b8dff67bac8fa2a8352bab Mon Sep 17 00:00:00 2001 From: Yarin Date: Wed, 21 Nov 2018 20:32:51 +0200 Subject: [PATCH 2/7] license --- build.gradle | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 806ccd32..ae9b5379 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { } } plugins { - id "com.jfrog.bintray" version "1.+" + id "com.jfrog.bintray" version "1.7" id 'net.researchgate.release' version '2.3.4' id "com.github.hierynomus.license" version "0.14.0" } @@ -24,8 +24,8 @@ apply plugin: 'biz.aQute.bnd.builder' apply plugin: 'com.jfrog.bintray' apply plugin: 'maven-publish' -def releaseVersion = System.properties.RELEASE_VERSION -version = releaseVersion ? releaseVersion : new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date()) +//def releaseVersion = System.properties.RELEASE_VERSION +//version = releaseVersion ? releaseVersion : new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date()) // custom tasks for creating source/javadoc jars task sourcesJar(type: Jar, dependsOn: classes) { @@ -157,8 +157,8 @@ publishing { afterReleaseBuild.dependsOn bintrayUpload bintray { - user = property('user') ?: System.getenv('BINTRAY_USER') ?: project.findProperty('BINTRAY_USER') ?: '' - key = property('key') ?: System.getenv('BINTRAY_KEY') ?: project.findProperty('BINTRAY_KEY') ?: '' + user = System.getenv('BINTRAY_USER') ?: project.findProperty('BINTRAY_USER') ?: '' + key = System.getenv('BINTRAY_KEY') ?: project.findProperty('BINTRAY_KEY') ?: '' publications = ['maven'] publish = true pkg { @@ -170,6 +170,12 @@ bintray { version { name = project.version released = new Date() + mavenCentralSync { + sync = true //[Default: true] Determines whether to sync the version to Maven Central. + user = mavenUser + password = mavenPass + close = '1' //Optional property. By default the staging repository is closed and artifacts are released to Maven Central. You can optionally turn this behaviour off (by puting 0 as value) and release the version manually. + } } } } From 2890f8f040f75099d5c1b58fcfc2ae9dc6a919ee Mon Sep 17 00:00:00 2001 From: Yarin Date: Wed, 21 Nov 2018 20:47:43 +0200 Subject: [PATCH 3/7] license --- build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index ae9b5379..81e7e6f5 100644 --- a/build.gradle +++ b/build.gradle @@ -170,12 +170,12 @@ bintray { version { name = project.version released = new Date() - mavenCentralSync { - sync = true //[Default: true] Determines whether to sync the version to Maven Central. - user = mavenUser - password = mavenPass - close = '1' //Optional property. By default the staging repository is closed and artifacts are released to Maven Central. You can optionally turn this behaviour off (by puting 0 as value) and release the version manually. - } +// mavenCentralSync { +// sync = false //[Default: true] Determines whether to sync the version to Maven Central. +// user = mavenUser +// password = mavenPass +// close = '1' //Optional property. By default the staging repository is closed and artifacts are released to Maven Central. You can optionally turn this behaviour off (by puting 0 as value) and release the version manually. +// } } } } From bdbde5398e6d7e1875d5a57813ac9aada54f25bd Mon Sep 17 00:00:00 2001 From: Yarin Date: Wed, 21 Nov 2018 20:50:24 +0200 Subject: [PATCH 4/7] license --- build.gradle | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build.gradle b/build.gradle index 81e7e6f5..02445873 100644 --- a/build.gradle +++ b/build.gradle @@ -170,12 +170,6 @@ bintray { version { name = project.version released = new Date() -// mavenCentralSync { -// sync = false //[Default: true] Determines whether to sync the version to Maven Central. -// user = mavenUser -// password = mavenPass -// close = '1' //Optional property. By default the staging repository is closed and artifacts are released to Maven Central. You can optionally turn this behaviour off (by puting 0 as value) and release the version manually. -// } } } } From a0ed9ab188f64d8ca47c459e37de87b1e8c63d8d Mon Sep 17 00:00:00 2001 From: Yarin Date: Fri, 23 Nov 2018 18:05:46 +0200 Subject: [PATCH 5/7] working bintrayupload --- build.gradle | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 02445873..acf48aa3 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { } } plugins { - id "com.jfrog.bintray" version "1.7" + id "com.jfrog.bintray" version "1.8.4" id 'net.researchgate.release' version '2.3.4' id "com.github.hierynomus.license" version "0.14.0" } diff --git a/gradle.properties b/gradle.properties index 0502e244..5846d887 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,4 +5,4 @@ org.gradle.daemon=true org.gradle.parallel=true org.gradle.jvmargs=-Dfile.encoding=UTF-8 -version = 6.1.1 +version = 6.1 From 8549d8e188c362a186b6ac7724738b1d4d6970eb Mon Sep 17 00:00:00 2001 From: Yarin Date: Fri, 23 Nov 2018 18:11:10 +0200 Subject: [PATCH 6/7] working bintrayupload --- build.gradle | 7 +++++++ gradle.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index acf48aa3..7b24967a 100644 --- a/build.gradle +++ b/build.gradle @@ -170,6 +170,13 @@ bintray { version { name = project.version released = new Date() + mavenCentralSync { + sync = true //[Default: true] Determines whether to sync the version to Maven Central. + user = System.getenv('OSS_USER') ?: project.findProperty('OSS_USER') ?: '' + password = System.getenv('OSS_PASS') ?: project.findProperty('OSS_PASS') ?: '' + close = '1' + //Optional property. By default the staging repository is closed and artifacts are released to Maven Central. You can optionally turn this behaviour off (by puting 0 as value) and release the version manually. + } } } } diff --git a/gradle.properties b/gradle.properties index 5846d887..169db324 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,4 +5,4 @@ org.gradle.daemon=true org.gradle.parallel=true org.gradle.jvmargs=-Dfile.encoding=UTF-8 -version = 6.1 +version = 6.2 From b6d60c48d2b0203bf061193bfc55c805bf09e194 Mon Sep 17 00:00:00 2001 From: Yarin Date: Fri, 23 Nov 2018 18:15:37 +0200 Subject: [PATCH 7/7] remove unnecessary files --- secret2.gpg | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 secret2.gpg diff --git a/secret2.gpg b/secret2.gpg deleted file mode 100644 index e69de29b..00000000