Upgrade to Gradle 6.2.1

This commit is contained in:
Edwin Jakobs
2020-02-26 16:50:06 +01:00
parent 8d2b622cbb
commit 50b4a1fca0
3 changed files with 33 additions and 38 deletions

View File

@@ -5,25 +5,14 @@ buildscript {
dependencies {
classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.17"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.17"
classpath "com.netflix.nebula:nebula-kotlin-plugin:1.3.61"
classpath "com.netflix.nebula:nebula-publishing-plugin:17.0.5"
classpath "com.netflix.nebula:nebula-release-plugin:14.1.0"
classpath "com.netflix.nebula:nebula-bintray-plugin:8.3.0"
}
}
plugins {
// plugin dependencies, load without applying them
id 'nebula.kotlin' version '1.3.50' apply false
id 'com.jfrog.artifactory' version '4.6.2' apply false
id 'nebula.contacts' version '4.1.1' apply false
id 'nebula.info' version '4.0.2' apply false
id 'nebula.dependency-lock' version '6.1.2' apply false
id 'nebula.facet' version '5.1.2' apply false
id 'nebula.maven-apache-license' version '9.0.2' apply false
id 'nebula.maven-publish' version '9.0.2' apply false
id 'nebula.release' version '8.0.3' apply false
id 'nebula.nebula-bintray' version '4.0.2' apply false
id 'nebula.source-jar' version '9.0.2' apply false
}
//allprojects {
@@ -51,12 +40,15 @@ allprojects {
apply plugin: 'nebula.kotlin'
apply plugin: 'nebula.contacts'
apply plugin: 'nebula.info'
apply plugin: 'nebula.dependency-lock'
apply plugin: 'nebula.facet'
apply plugin: 'nebula.maven-apache-license'
apply plugin: 'nebula.release'
apply plugin: 'nebula.maven-publish'
apply plugin: 'nebula.nebula-bintray-publishing'
apply plugin: 'nebula.source-jar'
apply plugin: 'nebula.javadoc-jar'
apply plugin: 'nebula.nebula-bintray-publishing'
// selectively apply only the bintray plugin, snapshots are not published
// nebula-bintray needs to happened after nebula-release since version isn't lazy in the bintray extension
apply plugin: 'nebula.nebula-bintray-publishing'
@@ -77,16 +69,17 @@ allprojects {
}
dependencies {
compile "org.openrndr:openrndr-core:$openrndrVersion"
compile "org.openrndr:openrndr-filter:$openrndrVersion"
compile "org.openrndr:openrndr-shape:$openrndrVersion"
compile group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: '1.3.2'
implementation 'io.github.microutils:kotlin-logging:1.7.8'
implementation "org.openrndr:openrndr-core:$openrndrVersion"
implementation "org.openrndr:openrndr-filter:$openrndrVersion"
implementation "org.openrndr:openrndr-shape:$openrndrVersion"
implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: '1.3.2'
testImplementation "org.spekframework.spek2:spek-dsl-jvm:$spekVersion"
testImplementation "org.amshove.kluent:kluent:1.59"
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
testRuntimeOnly "org.spekframework.spek2:spek-runner-junit5:$spekVersion"
testRuntimeOnly "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
runtime "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
runtimeOnly "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
}
contacts {
@@ -97,19 +90,21 @@ allprojects {
}
bintray {
pkg {
userOrg = 'openrndr'
repo = 'openrndr'
name = 'orx'
desc = project.description
licenses = ['BSD-2-Clause']
vcsUrl = 'https://github.com/openrndr/openrndr.git'
websiteUrl = 'https://www.openrndr.org'
issueTrackerUrl = 'https://github.com/openrndr/openrndr/issues'
labels = ['creative-coding', 'realtime-rendering', 'opengl']
}
user = findProperty('bintrayUser') ?: System.getenv('BINTRAY_USER')
apiKey = findProperty('bintrayKey') ?: System.getenv('BINTRAY_KEY')
userOrg = 'openrndr'
repo = 'openrndr'
pkgName = 'orx'
gppSign = false
syncToMavenCentral = false
licenses = ['BSD-2-Clause']
vcsUrl = 'https://github.com/openrndr/openrndr-panel.git'
websiteUrl = 'https://www.openrndr.org'
issueTrackerUrl = 'https://github.com/openrndr/openrndr-panel/issues'
labels = ['creative-coding', 'realtime-rendering', 'opengl', 'gui']
}
test {
useJUnitPlatform {
includeEngines 'spek2'