Merge pull request #41 from modrinth/reformatting

.editorconfig

@@ -4,8 +4,9 @@ root = true
 end_of_line = lf
 insert_final_newline = true
 charset = utf-8
-indent_style = space
+indent_style = tab
 indent_size = 4
 
 [*.yml]
 indent_size = 2
+indent_style = space

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Reformatting from spaces -> tabs
+a3b3fe2edef2ab049339efd8e1209a84e1c33dcc

build.gradle

@@ -1,8 +1,8 @@
 plugins {
- id 'com.gradle.plugin-publish' version '1.1.0'
+ id 'com.gradle.plugin-publish' version '1.1.0'
 }
 
-version = '2.7.0-beta.3'
+version = '2.7.0'
 group = 'com.modrinth.minotaur'
 archivesBaseName = 'Minotaur'
 description = 'Modrinth plugin for publishing builds to the website!'
@@ -13,55 +13,55 @@ sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
 repositories {
- mavenCentral()
+ mavenCentral()
 }
 
 dependencies {
- compileOnly gradleApi()
- compileOnly group: 'org.jetbrains', name: 'annotations', version: '+'
- //noinspection VulnerableLibrariesLocal
- api group: 'dev.masecla', name: 'Modrinth4J', version: '2.0.0'
+ compileOnly gradleApi()
+ compileOnly group: 'org.jetbrains', name: 'annotations', version: '+'
+ //noinspection VulnerableLibrariesLocal
+ api group: 'dev.masecla', name: 'Modrinth4J', version: '2.0.0'
 }
 
 gradlePlugin {
- plugins {
- minotaur {
- id = 'com.modrinth.minotaur'
- implementationClass = 'com.modrinth.minotaur.Minotaur'
- displayName = 'Minotaur'
- }
- }
+ plugins {
+ minotaur {
+ id = 'com.modrinth.minotaur'
+ implementationClass = 'com.modrinth.minotaur.Minotaur'
+ displayName = 'Minotaur'
+ }
+ }
 }
 
 pluginBundle {
- website = 'https://modrinth.com'
- vcsUrl = 'https://github.com/modrinth/minotaur'
- description = 'Modrinth plugin for publishing builds to the website!'
- tags = ['modrinth', 'publish', 'mods', 'minecraft']
+ website = 'https://modrinth.com'
+ vcsUrl = 'https://github.com/modrinth/minotaur'
+ description = 'Modrinth plugin for publishing builds to the website!'
+ tags = ['modrinth', 'publish', 'mods', 'minecraft']
 }
 
 jar {
- manifest {
- attributes([
- 'Timestamp' : System.currentTimeMillis(),
- 'Specification-Title' : project.archivesBaseName,
- 'Specification-Vendor' : vendor,
- 'Specification-Version' : project.version,
- 'Implementation-Title' : project.archivesBaseName,
- 'Implementation-Version' : project.version,
- 'Implementation-Vendor' : vendor,
- 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
- 'Built-On-Java' : "${System.getProperty('java.vm.version')} (${System.getProperty('java.vm.vendor')})"
- ])
- }
+ manifest {
+ attributes([
+ 'Timestamp' : System.currentTimeMillis(),
+ 'Specification-Title' : project.archivesBaseName,
+ 'Specification-Vendor' : vendor,
+ 'Specification-Version' : project.version,
+ 'Implementation-Title' : project.archivesBaseName,
+ 'Implementation-Version' : project.version,
+ 'Implementation-Vendor' : vendor,
+ 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
+ 'Built-On-Java' : "${System.getProperty('java.vm.version')} (${System.getProperty('java.vm.vendor')})"
+ ])
+ }
 }
 
 java {
- withSourcesJar()
- withJavadocJar()
+ withSourcesJar()
+ withJavadocJar()
 }
 
 tasks.withType(JavaCompile).configureEach {
- it.options.encoding = "UTF-8"
- it.options.release.set(8)
+ it.options.encoding = "UTF-8"
+ it.options.release.set(8)
 }

fg/build.gradle

@@ -1,16 +1,16 @@
 buildscript {
- repositories {
- maven { url = 'https://files.minecraftforge.net/maven' }
- }
- dependencies {
- classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
- }
+ repositories {
+ maven { url = 'https://files.minecraftforge.net/maven' }
+ }
+ dependencies {
+ classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
+ }
 }
 
 plugins {
- id "com.modrinth.minotaur" version "2.+"
- id "java"
- id "idea"
+ id "com.modrinth.minotaur" version "2.+"
+ id "java"
+ id "idea"
 }
 
 apply plugin: 'net.minecraftforge.gradle'
@@ -19,11 +19,11 @@ version = "1.0.371"
 group = "com.modrinth.minotaur"
 
 minecraft {
- mappings channel: "official", version: "1.18.1"
+ mappings channel: "official", version: "1.18.1"
 }
 
 dependencies {
- minecraft "net.minecraftforge:forge:1.18.1-39.0.9"
+ minecraft "net.minecraftforge:forge:1.18.1-39.0.9"
 }
 
 java.withSourcesJar()
@@ -33,24 +33,24 @@ import com.modrinth.minotaur.dependencies.ModDependency
 import com.modrinth.minotaur.dependencies.VersionDependency
 
 modrinth {
- apiUrl = STAGING_API_URL
- projectId = "fred-3"
- uploadFile = jar
- additionalFiles = [project.file("build/libs/fg-$version-sources.jar")]
- versionType = "beta"
- dependencies = [
- new ModDependency("test-project", "optional"),
- new VersionDependency("CE5sWFeF", DependencyType.INCOMPATIBLE)
- ]
- dependencies {
- required.project "corrupted"
- optional.version "UakHulqw"
- incompatible.version "kdIr8lsr", "b1.2+mod"
- embedded.project "sbbGxWge"
- }
- debugMode = true
+ apiUrl = STAGING_API_URL
+ projectId = "fred-3"
+ uploadFile = jar
+ additionalFiles = [project.file("build/libs/fg-$version-sources.jar")]
+ versionType = "beta"
+ dependencies = [
+ new ModDependency("test-project", "optional"),
+ new VersionDependency("CE5sWFeF", DependencyType.INCOMPATIBLE)
+ ]
+ dependencies {
+ required.project "corrupted"
+ optional.version "UakHulqw"
+ incompatible.version "kdIr8lsr", "b1.2+mod"
+ embedded.project "sbbGxWge"
+ }
+ debugMode = true
 }
 
 tasks.modrinth.doLast {
- if (!modrinth.debugMode && tasks.modrinth.wasUploadSuccessful()) println tasks.modrinth.uploadInfo.id
+ if (!modrinth.debugMode && tasks.modrinth.wasUploadSuccessful()) println tasks.modrinth.uploadInfo.id
 }

loom/build.gradle

@@ -1,15 +1,15 @@
 plugins {
- id "fabric-loom" version "1.0.+"
- id "com.modrinth.minotaur" version "2.+"
+ id "fabric-loom" version "1.0.+"
+ id "com.modrinth.minotaur" version "2.+"
 }
 
 version = "2.7.0.3"
 group = "com.modrinth.minotaur"
 
 dependencies {
- minecraft "com.mojang:minecraft:1.17.1"
- mappings "net.fabricmc:yarn:1.17.1+build.65:v2"
- modImplementation "net.fabricmc:fabric-loader:0.12.12"
+ minecraft "com.mojang:minecraft:1.17.1"
+ mappings "net.fabricmc:yarn:1.17.1+build.65:v2"
+ modImplementation "net.fabricmc:fabric-loader:0.12.12"
 }
 
 java.withSourcesJar()
@@ -19,20 +19,20 @@ import com.modrinth.minotaur.dependencies.ModDependency
 import com.modrinth.minotaur.dependencies.VersionDependency
 
 modrinth {
- apiUrl = STAGING_API_URL
- projectId = "fred-3"
- uploadFile = remapJar
- additionalFiles = [project.file("build/libs/loom-$version-sources.jar")]
- versionType = "alpha"
- dependencies = [
- new ModDependency("test-project", "optional"),
- new VersionDependency("CE5sWFeF", DependencyType.INCOMPATIBLE)
- ]
- dependencies {
- required.project "corrupted"
- optional.version "UakHulqw"
- incompatible.version "kdIr8lsr", "b1.2+mod"
- embedded.project "sbbGxWge"
- }
- debugMode = true
+ apiUrl = STAGING_API_URL
+ projectId = "fred-3"
+ uploadFile = remapJar
+ additionalFiles = [project.file("build/libs/loom-$version-sources.jar")]
+ versionType = "alpha"
+ dependencies = [
+ new ModDependency("test-project", "optional"),
+ new VersionDependency("CE5sWFeF", DependencyType.INCOMPATIBLE)
+ ]
+ dependencies {
+ required.project "corrupted"
+ optional.version "UakHulqw"
+ incompatible.version "kdIr8lsr", "b1.2+mod"
+ embedded.project "sbbGxWge"
+ }
+ debugMode = true
 }

loom/src/main/resources/fabric.mod.json

@@ -1,5 +1,5 @@
 {
- "schemaVersion": 1,
- "id": "test",
- "version": ""
-}
+ "schemaVersion": 1,
+ "id": "test",
+ "version": ""
+}

settings.gradle

@@ -1,15 +1,15 @@
 pluginManagement {
- repositories {
- mavenLocal()
- maven {
- name = 'Fabric'
- url = 'https://maven.fabricmc.net/'
- }
- gradlePluginPortal()
- mavenCentral()
- }
+ repositories {
+ mavenLocal()
+ maven {
+ name = 'Fabric'
+ url = 'https://maven.fabricmc.net/'
+ }
+ gradlePluginPortal()
+ mavenCentral()
+ }
 }
 rootProject.name = 'Minotaur'
 if (!System.getenv().EXCLUDE_SUBPROJECTS) {
- include 'fg', 'loom'
+ include 'fg', 'loom'
 }