Skip to content

Commit 3ed8e99

Browse files
committed
Update to Gradle 9
1 parent 1bb1489 commit 3ed8e99

File tree

8 files changed

+22
-26
lines changed

8 files changed

+22
-26
lines changed

Test/Test1.12.2/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
2-
id 'fabric-loom' version '1.10-SNAPSHOT'
2+
id 'fabric-loom' version '1.14-SNAPSHOT'
3+
id "legacy-looming" version "1.14-SNAPSHOT"
34
}
45

56
java {
@@ -8,11 +9,11 @@ java {
89

910
repositories {
1011
//mavenLocal()
11-
maven { url 'https://raw.githubusercontent.com/BleachDev/cursed-mappings/main/' }
12+
maven { url = 'https://raw.githubusercontent.com/BleachDev/cursed-mappings/main/' }
1213
}
1314

1415
dependencies {
1516
minecraft "com.mojang:minecraft:1.12.2"
1617
mappings "net.legacyfabric:yarn:1.12.2+build.mcp"
17-
modImplementation "net.fabricmc:fabric-loader:0.16.9"
18+
modImplementation "net.fabricmc:fabric-loader:0.18.2"
1819
}

Test/Test1.14.4/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version '1.10-SNAPSHOT'
2+
id 'fabric-loom' version '1.14-SNAPSHOT'
33
}
44

55
java {
@@ -9,5 +9,5 @@ java {
99
dependencies {
1010
minecraft "com.mojang:minecraft:1.14.4"
1111
mappings loom.officialMojangMappings()
12-
modImplementation "net.fabricmc:fabric-loader:0.16.9"
12+
modImplementation "net.fabricmc:fabric-loader:0.18.2"
1313
}

Test/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'discombobulator' version '1.3-SNAPSHOT'
2+
id 'discombobulator' version "1.4-SNAPSHOT"
33
}
44

55
discombobulator {

Test/gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
org.gradle.jvmargs=-Xmx6G
1+
org.gradle.jvmargs=-Xmx6G
2+
org.gradle.configuration-cache=true
3+
org.gradle.warning.mode=fail

Test/settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ pluginManagement {
44
mavenCentral()
55
maven { url = "https://maven.minecrafttas.com/main" }
66
maven { url = "https://maven.fabricmc.net" }
7+
maven { url = "https://maven.legacyfabric.net/" }
78
gradlePluginPortal()
89
}
910
}

build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@ plugins {
44
id 'maven-publish'
55
}
66

7-
// Change java compatibility level to 23
8-
sourceCompatibility = targetCompatibility = 23
9-
107
def snapshot = project.release=="true" ? "" : "-SNAPSHOT"
118
version = project.version+snapshot
129
// Name, version and group for the project
1310
group = "com.minecrafttas"
14-
archivesBaseName = "discombobulator"
11+
base {
12+
archivesName = "discombobulator"
13+
}
1514

1615
// Configure the gradle plugin
1716
gradlePlugin {
@@ -28,9 +27,10 @@ repositories {
2827
}
2928

3029
dependencies {
31-
testImplementation(platform('org.junit:junit-bom:5.11.3'))
30+
testImplementation(platform('org.junit:junit-bom:6.0.1'))
3231
testImplementation('org.junit.jupiter:junit-jupiter')
33-
implementation 'commons-io:commons-io:2.17.0'
32+
testRuntimeOnly('org.junit.platform:junit-platform-launcher')
33+
implementation 'commons-io:commons-io:2.21.0'
3434
}
3535

3636
test {
@@ -41,6 +41,8 @@ test {
4141
}
4242

4343
java {
44+
sourceCompatibility = JavaVersion.VERSION_25
45+
targetCompatibility = JavaVersion.VERSION_25
4446
withSourcesJar()
4547
withJavadocJar()
4648
}

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
version=1.3.1
1+
version=1.4
22
release=false
3+
org.gradle.configuration-cache=true

src/main/java/com/minecrafttas/discombobulator/Discombobulator.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
package com.minecrafttas.discombobulator;
22

3-
import static com.minecrafttas.discombobulator.utils.Colors.BLUE;
4-
import static com.minecrafttas.discombobulator.utils.Colors.CYAN;
5-
import static com.minecrafttas.discombobulator.utils.Colors.GREEN;
6-
import static com.minecrafttas.discombobulator.utils.Colors.GREEN_BRIGHT;
7-
import static com.minecrafttas.discombobulator.utils.Colors.PURPLE;
8-
import static com.minecrafttas.discombobulator.utils.Colors.PURPLE_BRIGHT;
9-
import static com.minecrafttas.discombobulator.utils.Colors.RED;
10-
import static com.minecrafttas.discombobulator.utils.Colors.RED_BRIGHT;
11-
import static com.minecrafttas.discombobulator.utils.Colors.WHITE;
12-
import static com.minecrafttas.discombobulator.utils.Colors.YELLOW;
13-
143
import java.nio.file.Files;
154
import java.nio.file.Path;
165
import java.util.ArrayList;
@@ -137,7 +126,7 @@ public void apply(Project project) {
137126

138127
public static String getSplash() {
139128
return "\n" + (DISABLE_ANSI ? getColorLessSplash() : getColoredSplash()) + "\n\n"
140-
+ getCenterText(String.format("%sC%so%sl%so%sr%sf%su%sl%s!%s", RED, RED_BRIGHT, YELLOW, GREEN_BRIGHT, GREEN, CYAN, BLUE, PURPLE, PURPLE_BRIGHT, WHITE), 9) + "\n"
129+
+ getCenterText(String.format("Now using %sGradle 9", Colors.PURPLE), 9) + "\n"
141130
+ " Created by Pancake and Scribble\n" + getCenterText(discoVersion) + "\n\n";
142131

143132
}

0 commit comments

Comments
 (0)