Remove jcenter and update dependencies.

This commit is contained in:
Mark Nellemann 2021-08-22 15:55:46 +02:00
parent 7b8a9d56b3
commit 486f3131c6
3 changed files with 9 additions and 37 deletions

View file

@ -15,4 +15,5 @@ pipelines:
- gradle - gradle
name: Build and Release name: Build and Release
script: 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

View file

@ -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: "java-library"
apply plugin: "groovy" apply plugin: "groovy"
apply plugin: 'maven' apply plugin: 'maven'
apply plugin: 'jacoco' apply plugin: 'jacoco'
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
apply plugin: 'com.jfrog.bintray'
//apply from: "${project.projectDir}/gradle/clover.gradle"
sourceCompatibility = 1.8 sourceCompatibility = 1.8
targetCompatibility = 1.8 targetCompatibility = 1.8
@ -27,16 +14,16 @@ repositories {
dependencies { dependencies {
implementation("org.slf4j:slf4j-api:${slf4jVersion}") implementation("org.slf4j:slf4j-api:${slf4jVersion}")
api("com.google.code.gson:gson:2.8.5") api('com.google.code.gson:gson:2.8.7')
api("com.squareup.okhttp3:okhttp:4.1.0") api('com.squareup.okhttp3:okhttp:4.9.1')
testImplementation("org.slf4j:slf4j-simple:${slf4jVersion}") 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.codehaus.groovy:groovy-all:${groovyVersion}")
testCompile("org.spockframework:spock-core:${spockVersion}") { testCompile("org.spockframework:spock-core:${spockVersion}") {
exclude group: "org.codehaus.groovy" 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 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 = "libcvrapi"
websiteUrl = siteUrl
vcsUrl = gitUrl
licenses = licenses
publish = true
}
}
jacoco { jacoco {
toolVersion = "0.8.4" toolVersion = "0.8.4"
} }

View file

@ -2,8 +2,8 @@ id = libcvrapi
group = biz.nellemann.libs group = biz.nellemann.libs
version = 1.0.7 version = 1.0.7
licenses = ['APACHE-2.0'] // or something else licenses = ['APACHE-2.0'] // or something else
groovyVersion = 2.5.8 groovyVersion = 3.0.8
slf4jVersion = 1.7.28 slf4jVersion = 1.7.32
spockVersion = 1.3-groovy-2.5 spockVersion = 2.0-groovy-3.0
siteUrl = https://bitbucket.org/mnellemann/libcvrapi siteUrl = https://bitbucket.org/mnellemann/libcvrapi
gitUrl = https://bitbucket.org/mnellemann/libcvrapi.git gitUrl = https://bitbucket.org/mnellemann/libcvrapi.git