Skip to content

Commit 5aa5a31

Browse files
authored
Merge pull request #4 from halotroop2288/pr/update-1.3
Update Everything
2 parents 528e58f + 569e5ee commit 5aa5a31

File tree

6 files changed

+76
-54
lines changed

6 files changed

+76
-54
lines changed

build.gradle.kts

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import java.net.URI
22

33
plugins {
4-
kotlin("jvm") version "1.8.21"
4+
kotlin("jvm") version "1.9.23"
55
`java-gradle-plugin`
66
`maven-publish`
77
}
88

9-
version = if (project.hasProperty("version_snapshot")) project.properties["version"] as String + "-SNAPSHOT" else project.properties["version"] as String
10-
group = project.properties["maven_group"] as String
9+
version = "${project.properties["version"]}" + if (project.hasProperty("version_snapshot")) "-SNAPSHOT" else ""
10+
group = "${project.properties["maven_group"]}"
1111

12-
base {
13-
archivesName.set(project.properties["archives_base_name"] as String)
14-
}
12+
base.archivesName = "${project.properties["archives_base_name"]}"
1513

16-
val installer by sourceSets.creating
14+
val main: SourceSet by sourceSets.getting
15+
val installer: SourceSet by sourceSets.creating
16+
val installerImplementation: Configuration by configurations.getting
1717

1818
sourceSets {
1919
main {
@@ -25,13 +25,12 @@ sourceSets {
2525
repositories {
2626
maven("https://maven.wagyourtail.xyz/releases")
2727
maven("https://maven.wagyourtail.xyz/snapshots")
28-
maven("https://maven.jemnetworks.com/snapshots")
2928
mavenCentral()
3029
}
3130

3231
configurations {
3332
implementation {
34-
extendsFrom(configurations.named("installerImplementation").get())
33+
extendsFrom(installerImplementation)
3534
}
3635
}
3736

@@ -40,13 +39,13 @@ dependencies {
4039

4140
runtimeOnly(gradleApi())
4241

43-
implementation("xyz.wagyourtail.unimined:unimined:1.3.9")
44-
"installerImplementation"("io.github.java-diff-utils:java-diff-utils:4.12")
45-
"installerImplementation"("net.neoforged.installertools:binarypatcher:3.0.2")
46-
"installerImplementation"("org.ow2.asm:asm:9.7")
47-
"installerImplementation"("org.ow2.asm:asm-tree:9.7")
48-
"installerImplementation"("org.jetbrains:annotations:24.0.1")
49-
"installerImplementation"("com.nothome:javaxdelta:2.0.1")
42+
implementation("xyz.wagyourtail.unimined:unimined:1.3.15")
43+
installerImplementation("io.github.java-diff-utils:java-diff-utils:4.16")
44+
installerImplementation("net.neoforged.installertools:binarypatcher:3.0.13")
45+
installerImplementation("org.ow2.asm:asm:9.8")
46+
installerImplementation("org.ow2.asm:asm-tree:9.8")
47+
installerImplementation("org.jetbrains:annotations:26.0.2-1")
48+
installerImplementation("com.nothome:javaxdelta:2.0.1")
5049
}
5150

5251
gradlePlugin {
@@ -68,7 +67,7 @@ gradlePlugin {
6867
}
6968

7069
tasks.jar {
71-
from(sourceSets.main.get().output, installer.output)
70+
from(main.output, installer.output)
7271

7372
manifest {
7473
attributes(

gradle/wrapper/gradle-wrapper.jar

-14.9 KB
Binary file not shown.
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Tue Nov 21 10:56:45 MST 2023
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 33 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 23 additions & 18 deletions
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
@@ -1,3 +1,3 @@
11
rootProject.name = "patchbase"
22

3-
include("class-diff")
3+
include(":class-diff")

0 commit comments

Comments
 (0)