From 958350fe8aeb31c314d918cfc7e0eaac3e4d23cd Mon Sep 17 00:00:00 2001
From: Yoshiya Hinosawa <stibium121@gmail.com>
Date: Sat, 5 Nov 2016 13:29:13 +0900
Subject: [PATCH] chore(gradle): clean up gradle scripts

---
 build.gradle                             |  2 +-
 gradle/maven-and-signing.gradle          | 16 ++++------------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8c4db9d..b5b509f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'eclipse'
     id 'net.saliman.cobertura' version '2.2.5'
     id 'com.github.kt3k.coveralls' version '2.0.1'
-    id 'com.jfrog.bintray' version '0.5'
+    id 'com.jfrog.bintray' version '1.7'
 
 }
 
diff --git a/gradle/maven-and-signing.gradle b/gradle/maven-and-signing.gradle
index 90cf12b..0458a68 100644
--- a/gradle/maven-and-signing.gradle
+++ b/gradle/maven-and-signing.gradle
@@ -4,8 +4,8 @@ apply plugin: 'maven'
 apply plugin: 'maven-publish'
 apply plugin: 'com.jfrog.bintray'
 
-def getRepoURL() {
-    return properties.'sonatype.url' || 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
+def getSonatypeURL() {
+    return 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
@@ -13,21 +13,18 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
     from javadoc.destinationDir
 }
 
-
 task sourcesJar(type: Jar) {
     classifier = 'sources'
     from sourceSets.main.allSource
 }
 
-
 artifacts {
-    archives jar 
+    archives jar
 
     archives javadocJar
     archives sourcesJar
 }
 
-
 // sign archives if signatory exists
 if (signing.signatory) {
 
@@ -37,19 +34,16 @@ if (signing.signatory) {
 
 }
 
-
 uploadArchives {
     repositories {
         mavenDeployer {
-
             // sign pom if signatory exists
             if (signing.signatory) {
                 beforeDeployment {
                     signing.signPom(it)
                 }
 
-                repository(url: getRepoURL()) {
-
+                repository(url: sonatypeURL) {
                     authentication userName: properties['sonatype.username'], password: properties['sonatype.password']
                 }
             }
@@ -85,7 +79,6 @@ uploadArchives {
     }
 }
 
-
 def pomConfig = {
     licenses {
         license {
@@ -103,7 +96,6 @@ def pomConfig = {
     }
 }
 
-
 publishing {
     publications {
         my(MavenPublication) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 588fc0a..aff765f 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.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip