Skip to content

Commit b9ead81

Browse files
[ci skip] Gradle & Shadow 9.0.0; Rewrite .gitignore file (#1075)
Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
1 parent 12cde18 commit b9ead81

File tree

8 files changed

+26
-104
lines changed

8 files changed

+26
-104
lines changed

.gitignore

Lines changed: 19 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,36 @@
1-
### Java files ###
2-
*.class
1+
# Gradle
32

4-
# Package Files
5-
#*.jar
6-
*.war
7-
*.ear
8-
9-
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
10-
hs_err_pid*
3+
.gradle/
4+
build/
5+
out/
6+
classes/
7+
.kotlin/
118

9+
# Eclipse
1210

11+
*.launch
1312

14-
### Intellij ###
15-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
16-
# Ignore project files
17-
*.iml
13+
# Idea
1814

19-
# Ignore IDEA directory
20-
.idea/*
15+
.idea/
2116
!.idea/copyright/*
2217
!.idea/scopes/*
23-
24-
# Include the project's dictionary
25-
!.idea/dictionaries/
26-
!.idea/dictionaries/*
27-
28-
# File-based project format:
18+
*.iml
2919
*.ipr
3020
*.iws
3121

32-
### Plugin-specific files: ###
33-
# IntelliJ
34-
/out/
35-
36-
# mpeltonen/sbt-idea plugin
37-
.idea_modules/
22+
# VSCode
3823

39-
# JIRA plugin
40-
atlassian-ide-plugin.xml
41-
42-
# Crashlytics plugin (for Android Studio and IntelliJ)
43-
com_crashlytics_export_strings.xml
44-
crashlytics.properties
45-
crashlytics-build.properties
46-
47-
48-
49-
### Eclipse ###
50-
*.pydevproject
51-
.metadata
52-
.gradle
53-
bin/
54-
tmp/
55-
*.tmp
56-
*.bak
57-
*.swp
58-
*~.nib
59-
local.properties
6024
.settings/
61-
.loadpath
62-
63-
# Eclipse Core
64-
.project
65-
66-
# External tool builders
67-
.externalToolBuilders/
68-
69-
# Locally stored "Eclipse launch configurations"
70-
*.launch
71-
72-
# CDT-specific
73-
.cproject
74-
75-
# JDT-specific (Eclipse Java Development Tools)
25+
.vscode/
26+
bin/
7627
.classpath
28+
.project
7729

78-
# PDT-specific
79-
.buildpath
80-
81-
# sbteclipse plugin
82-
.target
83-
84-
# TeXlipse plugin
85-
.texlipse
86-
87-
88-
89-
### Maven ###
90-
target/
91-
pom.xml.tag
92-
pom.xml.releaseBackup
93-
pom.xml.versionsBackup
94-
pom.xml.next
95-
release.properties
96-
dependency-reduced-pom.xml
97-
buildNumber.properties
98-
99-
100-
101-
### NetBeans ###
102-
nbproject/private/
103-
build/
104-
nbbuild/
105-
dist/
106-
nbdist/
107-
nbactions.xml
108-
nb-configuration.xml
109-
.nb-gradle/
30+
# macOS
11031

111-
### MacOS ###
11232
.DS_Store
11333

114-
### Run Folder (ViaProxy) ###
115-
common/run/
34+
# Misc
35+
36+
run/

build-logic/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ repositories {
88

99
dependencies {
1010
// version must be manually kept in sync with the one in root project settings.gradle.kts
11-
implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.8")
11+
implementation("com.gradleup.shadow", "shadow-gradle-plugin", "9.0.1")
1212
}

build-logic/src/main/kotlin/vb.base-conventions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ tasks {
88
val ver = project.version.toString()
99
val desc = project.description
1010
filesMatching(listOf("plugin.yml", "META-INF/sponge_plugins.json", "fabric.mod.json")) {
11-
expand("version" to ver, "description" to desc)
11+
expand(mapOf("version" to ver, "description" to desc))
1212
}
1313
}
1414
javadoc {

build-logic/src/main/kotlin/vb.shadow-conventions.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ tasks {
1414
from(project.rootProject.file("LICENSE"))
1515
}
1616
val shadowJar = named<ShadowJar>("shadowJar") {
17+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
1718
archiveClassifier.set("")
1819
configureRelocations()
1920
}

gradle/wrapper/gradle-wrapper.jar

1.65 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
3+
distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pluginManagement {
1313
plugins {
1414
id("net.kyori.blossom") version "2.1.0"
1515
id("org.jetbrains.gradle.plugin.idea-ext") version "1.2"
16-
id("com.gradleup.shadow") version "8.3.8"
16+
id("com.gradleup.shadow") version "9.0.1"
1717
}
1818
}
1919

0 commit comments

Comments
 (0)