Skip to content

Commit

Permalink
bump: Gradle 7.5.1 to 8.5; bump: Lombok 1.18.24 to 1.18.30; bump: Jan…
Browse files Browse the repository at this point in the history
…kson 1.2.1 to 1.2.3; bump: Jabel 0.4.1 to 1.0.0;
  • Loading branch information
MJaroslav committed Jan 5, 2024
1 parent 4508742 commit df128fa
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 16 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed

- Bump Gradle 7.5.1 to 8.5
- Bump Lombok 1.18.24 to 1.18.30
- Bump Jankson 1.2.1 to 1.2.3
- Bump Jabel 0.4.1 to 1.0.0

## [1.2.1] - 2022-09-17

### Fixed
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ buildscript {
mavenCentral()
maven {
name 'forge'
url 'https://maven.minecraftforge.net/'
url 'https://maven.minecraftforge.net'
}
}
dependencies { classpath('com.anatawa12.forge:ForgeGradle:1.2-1.0.+') { changing = true } }
dependencies { classpath('com.anatawa12.forge:ForgeGradle:1.2-1.1.+') { changing = true } }
}

apply plugin: 'java'
Expand Down Expand Up @@ -36,7 +36,7 @@ group = buildprop.group
archivesBaseName = project.name

task devJar(type: Jar) {
classifier('dev')
archiveClassifier = 'dev'
manifest { from project.tasks.jar.manifest }
from sourceSets.main.output
}
Expand All @@ -53,7 +53,7 @@ configure([tasks.compileJava, tasks.compileTestJava, tasks.compileApiJava]) {
sourceCompatibility = 16 // for the IDE support
options.release = 8

javaCompiler = javaToolchains.compilerFor {languageVersion = JavaLanguageVersion.of(16) }
javaCompiler = javaToolchains.compilerFor { languageVersion = JavaLanguageVersion.of(16) }
}

minecraft {
Expand Down
10 changes: 5 additions & 5 deletions build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
####################
# Metadata
group=com.github.mjaroslav
version=1.2.1
version=1.3.0

###################
# Game properties #
Expand All @@ -19,10 +19,10 @@ run_dir=run
# Other libs versions #
#######################
# Project Lombok
lombok_version=1.18.24
lombok_version=1.18.30
# JetBrains Annotations
jetbrains_annotations_version=23.0.0
jetbrains_annotations_version=24.1.0
# Jankson
jankson_version=1.2.1
jankson_version=1.2.3
# Jabel
jabel_version=0.4.1
jabel_version=1.0.0
12 changes: 6 additions & 6 deletions gradle/configurations/v1.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ abstract class TestGameTask extends JavaExec {
task testJar(type: Jar, description: 'Make temp jar from test source set',
group: 'MCInGameTester') {
from sourceSets.test.output
destinationDir getTemporaryDir()
destinationDirectory = getTemporaryDir()
}

tasks.register('testClient', TestGameTask) {
Expand All @@ -53,8 +53,8 @@ tasks.register('testClient', TestGameTask) {
logOnlyTests = true
copyMappingsLocally = true
description 'Runs the Minecraft Client, runs game tests then stop it'
setMain(tasks.runClient.main)
setWorkingDir(getTemporaryDir())
mainClass = tasks.runClient.mainClass
workingDir = getTemporaryDir()
}

tasks.register('testServer', TestGameTask) {
Expand All @@ -64,14 +64,14 @@ tasks.register('testServer', TestGameTask) {
copyMappingsLocally = true
description 'Runs the Minecraft Server, runs game tests then stop it'
args args + "nogui"
setMain(tasks.runServer.main)
setWorkingDir(getTemporaryDir())
mainClass = tasks.runServer.mainClass
workingDir = getTemporaryDir()
}

repositories { maven { url 'https://jitpack.io' } }

dependencies {
testImplementation 'com.github.MJaroslav:MCInGameTester:v1.2.1:dev' // dev for deobf version
testImplementation 'com.github.MJaroslav:MCInGameTester:v1.3.0:dev' // dev for deobf version
}

// Add game tests to test in CI environment
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip

0 comments on commit df128fa

Please sign in to comment.