From 1aeef1bd198724070563381ab75a4a0a0183ec0f Mon Sep 17 00:00:00 2001
From: Mark Nellemann <mark.nellemann@gmail.com>
Date: Sun, 22 Aug 2021 15:57:54 +0200
Subject: [PATCH] Remove jcenter and update dependencies.

---
 bitbucket-pipelines.yml |  4 +++-
 build.gradle            | 37 ++++---------------------------------
 gradle.properties       |  6 +++---
 3 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index bb287f4..804ce33 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -15,4 +15,6 @@ pipelines:
             - gradle
           name: Build and Release
           script:
-            - bash ./gradlew clean build bintrayUpload
+            - bash ./gradlew clean build
+            - shopt -s nullglob ; for file in ${BITBUCKET_CLONE_DIR}/build/libs/*.jar ; do curl -X POST --user "${BB_AUTH_STRING}" "https://api.bitbucket.org/2.0/repositories/${BITBUCKET_REPO_OWNER}/${BITBUCKET_REPO_SLUG}/downloads" --form files=@"${file}" ; done
+
diff --git a/build.gradle b/build.gradle
index 09f3343..4263589 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,21 +1,8 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
-		//classpath 'com.bmuschko:gradle-clover-plugin:2.2.3'
-    }
-}
-
-apply plugin: "idea"
 apply plugin: "java-library"
 apply plugin: "groovy"
 apply plugin: 'maven'
 apply plugin: 'jacoco'
 apply plugin: 'maven-publish'
-apply plugin: 'com.jfrog.bintray'
-//apply from: "${project.projectDir}/gradle/clover.gradle"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -27,16 +14,16 @@ repositories {
 dependencies {
 
     implementation("org.slf4j:slf4j-api:${slf4jVersion}")
-    api('com.google.code.gson:gson:2.8.5')
-    api("com.squareup.okhttp3:okhttp:4.1.0")
+    api('com.google.code.gson:gson:2.8.7')
+    api('com.squareup.okhttp3:okhttp:4.9.1')
 
 	testImplementation("org.slf4j:slf4j-simple:${slf4jVersion}")
-	testImplementation('com.squareup.okhttp3:mockwebserver:4.1.0')
+	testImplementation('com.squareup.okhttp3:mockwebserver:4.9.1')
 	testCompile("org.codehaus.groovy:groovy-all:${groovyVersion}")
     testCompile("org.spockframework:spock-core:${spockVersion}") {
         exclude group: "org.codehaus.groovy"
     }
-    testCompile( 'com.athaydes:spock-reports:1.6.2' ) {
+    testCompile('com.athaydes:spock-reports:2.0-groovy-3.0') {
         transitive = false // this avoids affecting your version of Groovy/Spock
     }
 
@@ -53,22 +40,6 @@ publishing {
     }
 }
 
-bintray {
-    user = System.getenv('BINTRAY_USER')
-    key = System.getenv('BINTRAY_KEY')
-
-	override = true
-    configurations = ['archives']
-    pkg {
-        repo = "libs"
-        name = "libpaqle"
-        websiteUrl = siteUrl
-        vcsUrl = gitUrl
-        licenses = licenses
-        publish = true
-    }
-}
-
 jacoco {
 	toolVersion = "0.8.4"
 }
diff --git a/gradle.properties b/gradle.properties
index 98574f2..c769276 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,8 +2,8 @@ id            = libpaqle
 group         = biz.nellemann.libs
 version       = 1.0.2
 licenses      = ['APACHE-2.0'] // or something else
-groovyVersion = 2.5.8
-slf4jVersion  = 1.7.28
-spockVersion  = 1.3-groovy-2.5
+groovyVersion = 3.0.8
+slf4jVersion  = 1.7.32
+spockVersion  = 2.0-groovy-3.0
 siteUrl       = https://bitbucket.org/mnellemann/libpaqle
 gitUrl        = https://bitbucket.org/mnellemann/libpaqle.git