Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: bump gradle 6.9.2 -> 8.2 #9

Merged
merged 4 commits into from
Jul 30, 2023
Merged

build: bump gradle 6.9.2 -> 8.2 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d83da7c
build: bump gradle to 8.2
jdrueckert Jul 12, 2023
5978915
chore: adjust compatibility settings
jdrueckert Jul 12, 2023
0134d8e
chore: classifier got renamed to archiveClassifier
jdrueckert Jul 12, 2023
1bab832
revert: rename classifier in artifact
jdrueckert Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ group = 'org.terasology'

archivesBaseName = 'splash-screen' // for local jar files

sourceCompatibility = 1.8
targetCompatibility = 1.8
tasks.compileJava {
java.sourceCompatibility JavaVersion.VERSION_1_8
java.targetCompatibility JavaVersion.VERSION_1_8
}

// We use both Maven Central and our own Artifactory instance, which contains module builds, extra libs, and so on
repositories {
Expand Down Expand Up @@ -70,13 +72,13 @@ dependencies {
task sourceJar(type: Jar) {
description = "Create a JAR with all sources"
from sourceSets.main.allSource
classifier = 'sources'
archiveClassifier = 'sources'
}

task javadocJar(type: Jar, dependsOn: javadoc) {
description = "Create a JAR with the JavaDoc for the java sources"
from javadoc.destinationDir
classifier = 'javadoc'
archiveClassifier = 'javadoc'
}

// Define the artifacts we want to publish (the .pom will also be included since the Maven plugin is active)
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists