Skip to content

build: upgrade gradle to 8 #639

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

build: upgrade gradle to 8 #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2ca4b3
build: upgrade gradle to 8
anatawa12 Jun 10, 2023
0c94423
chore: upgrade mod-patching to 2.1.5
anatawa12 Jun 11, 2023
502c422
build: access shade in afterEvaluate
anatawa12 Jun 11, 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
25 changes: 13 additions & 12 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@
/// See LICENSE at https://github.com/fixrtm/fixRTM for more details

import com.anatawa12.jarInJar.gradle.TargetPreset
import com.anatawa12.modPatching.source.internal.readTextOr
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

plugins {
kotlin("jvm") version "1.8.0"
id("net.minecraftforge.gradle")
id("com.anatawa12.mod-patching.binary") version "2.1.3"
id("com.anatawa12.mod-patching.source") version "2.1.3"
id("com.anatawa12.mod-patching.resources-dev") version "2.1.3"
id("com.github.johnrengelman.shadow") version "7.1.2"
id("com.anatawa12.mod-patching.binary") version "2.1.5"
id("com.anatawa12.mod-patching.source") version "2.1.5"
id("com.anatawa12.mod-patching.resources-dev") version "2.1.5"
id("com.github.johnrengelman.shadow") version "8.1.1"
id("com.anatawa12.jarInJar") version "1.0.3"
}

Expand Down Expand Up @@ -142,13 +141,15 @@ val runServer = minecraft.runs.create("server") {
}

val jar by tasks.getting(Jar::class) {
shade.forEach { dep ->
from(project.zipTree(dep)) {
exclude("META-INF", "META-INF/**")
exclude("LICENSE.txt")
}
from(project.zipTree(dep)) {
include("META-INF/services/**")
afterEvaluate {
shade.forEach { dep ->
from(project.zipTree(dep)) {
exclude("META-INF", "META-INF/**")
exclude("LICENSE.txt")
}
from(project.zipTree(dep)) {
include("META-INF/services/**")
}
}
}

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-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ buildscript {
}
dependencies {
// use latest version by dependabot. dependabot supports dependencies in settings.gralde
classpath("net.minecraftforge.gradle:ForgeGradle:5.1.64")
classpath("net.minecraftforge.gradle:ForgeGradle:6.0.6")
}
}