Skip to content

Commit 74ab875

Browse files
3.8.0 beta
1 parent 9244110 commit 74ab875

File tree

5 files changed

+13
-24
lines changed

5 files changed

+13
-24
lines changed

build.gradle

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
import org.jetbrains.changelog.Changelog
2-
import org.jetbrains.gradle.ext.Gradle
1+
import org.jetbrains.gradle.ext.Gradle
32

43
plugins {
54
id 'java'
65
id 'java-library'
76
id 'maven-publish'
87
id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.10'
98
id 'org.jetbrains.changelog' version '2.2.1'
10-
id 'xyz.wagyourtail.unimined' version '1.4.1'
9+
id 'xyz.wagyourtail.unimined' version '1.4.9-kappa'
1110
}
1211

1312
apply from: 'gradle/scripts/helpers.gradle'
@@ -33,13 +32,13 @@ version = propertyString('mod_version')
3332
group = propertyString('root_package')
3433

3534
base {
36-
archivesName.set(propertyString('mod_id'))
35+
archivesName = propertyString('mod_id')
3736
}
3837

3938

4039
java {
4140
toolchain {
42-
languageVersion.set(JavaLanguageVersion.of(21))
41+
languageVersion = JavaLanguageVersion.of(21)
4342
}
4443
if (propertyBool('generate_sources_jar')) {
4544
withSourcesJar()
@@ -64,9 +63,9 @@ unimined.minecraft {
6463

6564
cleanroom {
6665
if (propertyBool('use_access_transformer')) {
67-
accessTransformer 'src/main/resources/META-INF/' + propertyString('access_transformer_locations')
66+
accessTransformer "src/main/resources/META-INF/${propertyString('access_transformer_locations')}"
6867
}
69-
loader "0.3.13-alpha"
68+
loader "0.3.31-alpha"
7069
runs.config("client") {
7170
jvmArgs extra_jvm_args
7271
}
@@ -205,18 +204,6 @@ test {
205204
}
206205
}
207206

208-
String parserChangelog() {
209-
if (!file('CHANGELOG.md').exists()) {
210-
throw new GradleException('publish_with_changelog is true, but CHANGELOG.md does not exist in the workspace!')
211-
}
212-
String parsedChangelog = changelog.renderItem(
213-
changelog.get(propertyString('mod_version')).withHeader(false).withEmptySections(false),
214-
Changelog.OutputType.MARKDOWN)
215-
if (parsedChangelog.isEmpty()) {
216-
throw new GradleException('publish_with_changelog is true, but the changelog for the latest version is empty!')
217-
}
218-
return parsedChangelog
219-
}
220207

221208
def injectTags() {
222209
var target = new File("${rootProject.projectDir}/src/main/java/${root_package.replace('.', '/')}/${mod_id}/Reference.java")

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ show_testing_output = false
1111

1212
# Mod Information
1313
# HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
14-
mod_version = 3.7.2
14+
mod_version = 3.8.0-RC4
1515
root_package = com.cleanroommc
1616
mod_id = scalar
1717
mod_name = Scalar
@@ -68,4 +68,4 @@ coremod_plugin_class_name =com.cleanroommc.scalar.ScalarLoadingPlugin
6868
# Convenient way to allow downloading of assets from official vanilla Minecraft servers, CurseForge, or any direct links
6969
# Documentation: https://github.com/CleanroomMC/AssetMover
7070
use_asset_mover = false
71-
asset_mover_version = 2.5
71+
asset_mover_version = 2.5

gradle/scripts/dependencies.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ dependencies {
2020

2121

2222
contain "org.scala-lang:scala3-library_3:${mod_version}"
23-
contain 'org.scala-lang:scala-library:2.13.16'
2423
// Example - Dependency descriptor:
2524
// 'com.google.code.gson:gson:2.8.6' << group: com.google.code.gson, name:gson, version:2.8.6
2625
// 'group:name:version:classifier' where classifier is optional

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

settings.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
pluginManagement {
22
repositories {
33
mavenCentral()
4+
maven {
5+
url = "https://maven.arcseekers.com/releases"
6+
}
47
maven {
58
url = "https://maven.neoforged.net/releases"
69
}
@@ -26,7 +29,7 @@ pluginManagement {
2629

2730
plugins {
2831
// Automatic toolchain provisioning
29-
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
32+
id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
3033
}
3134

3235
// Due to an IntelliJ bug, this has to be done

0 commit comments

Comments
 (0)