Skip to content

Commit 0690358

Browse files
Merge remote-tracking branch 'origin/master'
2 parents c120eb9 + fa7d602 commit 0690358

4 files changed

Lines changed: 19 additions & 26 deletions

File tree

build.gradle

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
plugins {
2-
id 'fabric-loom' version '0.9-SNAPSHOT'
2+
id 'fabric-loom' version '0.10-SNAPSHOT'
33
id 'maven-publish'
4-
id 'org.jetbrains.kotlin.jvm' version "1.5.21"
4+
id 'org.jetbrains.kotlin.jvm' version "1.6.0"
55
}
66

7-
sourceCompatibility = JavaVersion.VERSION_16
8-
targetCompatibility = JavaVersion.VERSION_16
7+
sourceCompatibility = JavaVersion.VERSION_17
8+
targetCompatibility = JavaVersion.VERSION_17
99

1010
archivesBaseName = project.archives_base_name
1111
version = project.mod_version
@@ -19,6 +19,9 @@ repositories {
1919
maven {
2020
url = "https://oss.sonatype.org/content/repositories/snapshots"
2121
}
22+
maven {
23+
url = "https://maven.bymartrixx.me/"
24+
}
2225
}
2326

2427
dependencies {
@@ -31,9 +34,9 @@ dependencies {
3134
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
3235

3336
// Yes this has to be capitalised
34-
modImplementation "com.github.quiltservertools:Ledger:1.0.2"
37+
modImplementation "com.github.quiltservertools:Ledger:1.2.0"
3538

36-
modImplementation "net.fabricmc:fabric-language-kotlin:1.6.3+kotlin.1.5.21"
39+
modImplementation "net.fabricmc:fabric-language-kotlin:1.7.0+kotlin.1.6.0"
3740

3841
// H2
3942
implementation(include("com.h2database:h2:1.4.200"))
@@ -54,14 +57,9 @@ processResources {
5457
}
5558

5659
tasks.withType(JavaCompile).configureEach {
57-
// ensure that the encoding is set to UTF-8, no matter what the system default is
58-
// this fixes some edge cases with special characters not displaying correctly
59-
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
60-
// If Javadoc is generated, this must be specified in that task too.
6160
it.options.encoding = "UTF-8"
6261

63-
// Minecraft 1.17 (21w19a) upwards uses Java 16.
64-
it.options.release = 16
62+
it.options.release = 17
6563
}
6664

6765
java {
@@ -91,11 +89,6 @@ publishing {
9189
}
9290
}
9391

94-
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
9592
repositories {
96-
// Add repositories to publish to here.
97-
// Notice: This block does NOT have the same function as the block in the top level.
98-
// The repositories here will be used for publishing your artifact, not for
99-
// retrieving dependencies.
10093
}
10194
}

gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/versions.html
6-
minecraft_version=1.17.1
7-
yarn_mappings=1.17.1+build.37
8-
loader_version=0.11.6
6+
minecraft_version=1.18
7+
yarn_mappings=1.18+build.1
8+
loader_version=0.12.5
99

1010
# Mod Properties
11-
mod_version = 1.0.0
11+
mod_version = 1.0.1
1212
maven_group = net.quiltservertools
1313
archives_base_name = ledger-databases
1414

1515
# Dependencies
16-
fabric_version=0.37.2+1.17
16+
fabric_version=0.43.1+1.18
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

src/main/resources/fabric.mod.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
},
2626

2727
"depends": {
28-
"fabricloader": ">=0.11.3",
28+
"fabricloader": ">=0.12.5",
2929
"fabric": "*",
30-
"minecraft": "1.17.x",
30+
"minecraft": "1.18.x",
3131
"java": ">=16",
32-
"ledger": ">=1.1.0",
32+
"ledger": ">=1.2.0",
3333
"fabric-language-kotlin": "*"
3434
}
3535
}

0 commit comments

Comments
 (0)