kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to Gradle 7.4.2, Nebula release 16.0.0, Kotlin 1.6.20

Browse Source
This commit is contained in:
Edwin Jakobs
2022-04-05 07:48:42 +02:00
parent 6f1a5453d1
commit 2285cec1e4
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build.gradle
View File

@@ -4,7 +4,7 @@ buildscript {
} }
dependencies { 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-release-plugin:15.3.1" classpath "com.netflix.nebula:nebula-release-plugin:16.0.0"
} }
} }
@@ -42,7 +42,7 @@ def doNotPublish = ["openrndr-demos"]
project.ext { project.ext {
kotlinApiVersion = '1.6' kotlinApiVersion = '1.6'
kotlinLanguageVersion = '1.6' kotlinLanguageVersion = '1.6'
kotlinVersion = '1.6.10' kotlinVersion = '1.6.20'
kotlinxCoroutinesVersion = '1.6.0' kotlinxCoroutinesVersion = '1.6.0'
kotlinLoggingVersion = '2.1.21' kotlinLoggingVersion = '2.1.21'
kotlinxSerializationVersion = '1.3.2' kotlinxSerializationVersion = '1.3.2'
@@ -88,6 +88,7 @@ allprojects {
url = "https://maven.openrndr.org" url = "https://maven.openrndr.org"
} }
} }
} }
switch (org.gradle.internal.os.OperatingSystem.current()) { switch (org.gradle.internal.os.OperatingSystem.current()) {
@@ -375,6 +376,8 @@ nexusPublishing {
} }
//configure(allprojects.findAll { it.name != "openrndr-demos" }) { //configure(allprojects.findAll { it.name != "openrndr-demos" }) {
// apply plugin: 'maven-publish' // apply plugin: 'maven-publish'
// apply plugin: 'nebula.release' // apply plugin: 'nebula.release'

2
buildSrc/build.gradle.kts
View File

@@ -24,7 +24,7 @@ repositories {
val openrndrVersion = ((findProperty("OPENRNDR.version")?.toString())?:System.getenv("OPENRNDR_VERSION"))?.replace("v", "") ?: "0.5.1-SNAPSHOT" val openrndrVersion = ((findProperty("OPENRNDR.version")?.toString())?:System.getenv("OPENRNDR_VERSION"))?.replace("v", "") ?: "0.5.1-SNAPSHOT"
dependencies { dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20")
val preloadImplementation by configurations.getting { } val preloadImplementation by configurations.getting { }
preloadImplementation("org.openrndr:openrndr-application:$openrndrVersion") preloadImplementation("org.openrndr:openrndr-application:$openrndrVersion")
preloadImplementation("org.openrndr:openrndr-extensions:$openrndrVersion") preloadImplementation("org.openrndr:openrndr-extensions:$openrndrVersion")

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists