Cleanup gradle/maven stuff.

2021-08-22 21:02:52 +02:00
parent 50d5fa3348
commit 5506f91198
6 changed files with 46 additions and 58 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,10 @@
 buildscript {
    repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
+        maven { url = 'https://maven.minecraftforge.net' }
        mavenCentral()
    }
    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
    }
 }

@@ -38,8 +38,7 @@ if (build_number == null)
    build_number = getGitRef()

 version = "${semver}+${build_number}"
-group = mod_group
-archivesBaseName = "${mod_name.replace(' ', '-')}-MC${minecraft_version}-Forge"
+group = 'li.cil.oc2'

 java.toolchain.languageVersion = JavaLanguageVersion.of(8)

@@ -52,27 +51,27 @@ repositories {
 dependencies {
    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"

-    compileOnly "org.jetbrains:annotations:16.0.2"
+    compileOnly 'org.jetbrains:annotations:21.0.1'

-    implementation "li.cil.sedna:sedna-mc:MC${minecraft_version}-Forge-1.0.1+271"
+    implementation "li.cil.sedna:sedna-${minecraft_version}-forge:1.0.0+"

    // These three will be provided by sedna-mc in standalone.
-    implementation "li.cil.ceres:ceres:0.0.2+20"
-    implementation "li.cil.sedna:sedna:1.0.1+101"
-    implementation "li.cil.sedna:sedna-buildroot:0.0.1+15"
+    implementation 'li.cil.ceres:ceres:0.0.3+'
+    implementation 'li.cil.sedna:sedna:1.0.1+'
+    implementation 'li.cil.sedna:sedna-buildroot:0.0.1+15'

-    compileOnly fg.deobf("li.cil.markdown_manual:MarkdownManual:MC${minecraft_version}-Forge-${manual_version}:api")
-    runtimeOnly fg.deobf("li.cil.markdown_manual:MarkdownManual:MC${minecraft_version}-Forge-${manual_version}")
+    compileOnly fg.deobf("li.cil.markdown_manual:markdown_manual-${minecraft_version}-forge:${manual_version}:api")
+    runtimeOnly fg.deobf("li.cil.markdown_manual:markdown_manual-${minecraft_version}-forge:${manual_version}")

    compileOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}:${jei_version}:api")
    runtimeOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}:${jei_version}")

-    testImplementation "li.cil.ceres:ceres:0.0.2+20"
-    testImplementation "li.cil.sedna:sedna:1.0.0+100"
+    testImplementation 'li.cil.ceres:ceres:0.0.3+'
+    testImplementation 'li.cil.sedna:sedna:1.0.1+'

-    testImplementation "org.mockito:mockito-core:2.+"
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.3.1"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.3.1"
+    testImplementation 'org.mockito:mockito-core:2.+'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
 }

 task packageScripts(type: Zip) {
@@ -81,23 +80,7 @@ task packageScripts(type: Zip) {
    from 'src/main/scripts'
 }

-processResources {
-    dependsOn { packageScripts }
-    from(sourceSets.main.resources.srcDirs) {
-        include 'META-INF/mods.toml'
-
-        expand([
-                'mod_version'          : version,
-                'mod_name'             : mod_name,
-                'mod_url'              : mod_url,
-                'mod_issues_url'       : mod_issues_url,
-                'forge_version_min'    : forge_version_min,
-                'minecraft_version_min': minecraft_version_min,
-                'oc2_sedna_version_min': oc2_sedna_version_min,
-                'manual_version_min'   : manual_version,
-        ])
-    }
-}
+processResources.dependsOn(packageScripts)

 minecraft {
    mappings channel: mappings_channel, version: mappings_version
@@ -182,7 +165,6 @@ artifacts {
 publishing {
    publications {
        mavenJava(MavenPublication) {
-            version "MC${minecraft_version}-Forge-${version}"
            artifact jar
            artifact apiJar
        }
@@ -194,6 +176,22 @@ publishing {
    }
 }

+curseforge {
+    apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
+    project {
+        id = curse_project_id
+        releaseType = curse_project_releaseType
+        changelogType = 'markdown'
+        changelog = file('changelog.md')
+        addGameVersion 'Forge'
+        addGameVersion minecraft_version
+        addGameVersion 'Java 8'
+        relations {
+            requiredDependency 'markdownmanual'
+        }
+    }
+}
+
 idea {
    module {
        for (final String exclude in ['assets', 'run', 'out', 'logs', 'src/generated']) {
--- a/changelog.md
+++ b/changelog.md
@@ -0,0 +1 @@
+* Initial release.
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,26 +4,18 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false

 minecraft_version=1.16.5
-minecraft_version_min=1.16.5
 mappings_channel=official
 mappings_version=1.16.5
 forge_version=36.1.32
-forge_version_min=36.1.0

-mod_group=li.cil.oc2
-mod_id=oc2
-mod_name=OpenComputers II
-mod_url=https://github.com/fnuecke/oc2
-mod_issues_url=https://github.com/fnuecke/oc2/issues
 version_major=0
 version_minor=0
 version_patch=1

-oc2_sedna_version_min=0.0.1
 manual_version=1.1.0+

 jei_minecraft_version=1.16.4
 jei_version=7.6.1.71

-curse.project.id=0
-curse.project.releaseType=release
+curse_project_id=0
+curse_project_releaseType=release
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1 @@
-rootProject.name = 'oc2'
-
+rootProject.name = 'oc2-1.16.5-forge'
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -1,14 +1,12 @@
 modLoader = "javafml"
-loaderVersion = "[31,)"
-issueTrackerURL = "${mod_issues_url}"
+loaderVersion = "[36,)"
+issueTrackerURL = "https://github.com/fnuecke/oc2/issues"
 license = "MIT"

 [[mods]]
 modId = "oc2"
-version = "${mod_version}"
-displayName = "${mod_name}"
-displayURL = "${mod_url}"
-#logoFile = "logo.png"
+version = "${file.jarVersion}"
+displayName = "OpenComputers II"
 authors = "Sangar"
 description = '''
 Modern computers for the modern player.
@@ -19,23 +17,23 @@ This mod uses the Terminus Font under the Open Font License.
 [[dependencies.oc2]]
 modId = "forge"
 mandatory = true
-versionRange = "[${forge_version_min},)"
+versionRange = "[36.1.0,)"
 ordering = "NONE"
 side = "BOTH"
 [[dependencies.oc2]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[${minecraft_version_min}]"
+versionRange = "[1.16.5,1.17)"
 ordering = "NONE"
 side = "BOTH"
 [[dependencies.oc2]]
-modId = "oc2-sedna"
+modId = "sedna"
 mandatory = true
-versionRange = "[${oc2_sedna_version_min},)"
+versionRange = "[0.0.1,)"
 ordering = "NONE"
 side = "BOTH"
 [[dependencies.oc2]]
 modId = "markdown_manual"
 mandatory = true
-versionRange = "[${manual_version_min},)"
+versionRange = "[1.1.0,)"
 side = "CLIENT"