Deploy MinecraftForge-API and upgrade kotlin to 1.6.10

BlueberryMC · Dec 16, 2021 · c936e21 · c936e21
1 parent 337a62b
commit c936e21
Show file tree

Hide file tree

Showing 7 changed files with 102 additions and 18 deletions.
diff --git a/Blueberry-API/pom.xml b/Blueberry-API/pom.xml
@@ -79,7 +79,7 @@
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
-                <version>1.6.0</version>
+                <version>1.6.10</version>
                 <executions>
                     <execution>
                         <id>compile</id>
@@ -200,7 +200,7 @@
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.10</version>
         </dependency>
         <dependency>
             <groupId>com.mojang</groupId>

diff --git a/MagmaCube-Patches/0001-POM-Changes.patch b/MagmaCube-Patches/0001-POM-Changes.patch
@@ -14,7 +14,7 @@ index 0000000000000000000000000000000000000000..65e6bdbaa3a38354f7bc205526355cc3
 +*.iml
 +build/
 diff --git a/pom.xml b/pom.xml
-index 6600788fb4994a12190c78161e44d0b0ebbdee0f..2f35c6918925c6a598f1a2bdcc01d5dedcfcd26f 100644
+index 6600788fb4994a12190c78161e44d0b0ebbdee0f..18294de815061e3b9cb514d56be8ed98d14e9bbb 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,9 +3,11 @@
@@ -126,7 +126,7 @@ index 6600788fb4994a12190c78161e44d0b0ebbdee0f..2f35c6918925c6a598f1a2bdcc01d5de
 +        <dependency>
 +            <groupId>org.jetbrains.kotlin</groupId>
 +            <artifactId>kotlin-stdlib</artifactId>
-+            <version>1.6.0</version>
++            <version>1.6.10</version>
 +            <scope>provided</scope>
 +        </dependency>
 +        <dependency>

diff --git a/MinecraftForge-API/build.gradle.kts b/MinecraftForge-API/build.gradle.kts
@@ -7,3 +7,18 @@ dependencies {
     compileOnly("net.blueberrymc.minecraft:minecraft:$minecraftVersion")
     compileOnly("org.jetbrains:annotations:22.0.0")
 }
+
+publishing {
+    repositories {
+        maven {
+            name = "blueberryRepo"
+            credentials(PasswordCredentials::class)
+            url = uri(
+                if (project.version.toString().endsWith("-SNAPSHOT"))
+                    "https://repo.blueberrymc.net/repository/maven-snapshots/"
+                else
+                    "https://repo.blueberrymc.net/repository/maven-releases/"
+            )
+        }
+    }
+}
diff --git a/MinecraftForge-API/pom.xml b/MinecraftForge-API/pom.xml
@@ -13,6 +13,65 @@
     <version>${api.version}</version>
     <name>MinecraftForge-API</name>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.3.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>deploy</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>deploy</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>net.blueberrymc</groupId>
@@ -33,4 +92,14 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
+    <distributionManagement>
+        <repository>
+            <id>blueberrymc-repo</id>
+            <url>https://repo.blueberrymc.net/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>blueberrymc-repo</id>
+            <url>https://repo.blueberrymc.net/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
 </project>
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     java
-    kotlin("jvm") version "1.6.0"
+    kotlin("jvm") version "1.6.10"
     `maven-publish`
     `java-library`
 }
@@ -44,7 +44,7 @@ subprojects {
     }
 
     dependencies {
-        implementation(kotlin("stdlib", "1.6.0"))
+        implementation(kotlin("stdlib", "1.6.10"))
     }
 
     publishing {
@@ -92,7 +92,7 @@ allprojects {
 
 subprojects {
     dependencies {
-        testImplementation("org.jetbrains.kotlin:kotlin-test-junit:1.6.0")
+        testImplementation("org.jetbrains.kotlin:kotlin-test-junit:1.6.10")
         testImplementation("org.junit.jupiter:junit-jupiter:5.8.0")
         testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
     }

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.6.0"
+    kotlin("jvm") version "1.6.10"
 }
 
 repositories {
@@ -8,5 +8,5 @@ repositories {
 }
 
 dependencies {
-    implementation(kotlin("stdlib", "1.6.0"))
+    implementation(kotlin("stdlib", "1.6.10"))
 }
diff --git a/scripts/files/version.json b/scripts/files/version.json
@@ -1506,24 +1506,24 @@
     {
       "downloads": {
         "artifact": {
-          "path": "org/jetbrains/kotlin/kotlin-stdlib/1.6.0/kotlin-stdlib-1.6.0.jar",
-          "sha1": "a40b8b22529b733892edf4b73468ce598bb17f04",
+          "path": "org/jetbrains/kotlin/kotlin-stdlib/1.6.10/kotlin-stdlib-1.6.10.jar",
+          "sha1": "b8af3fe6f1ca88526914929add63cf5e7c5049af",
           "size": 1508076,
-          "url": "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.0/kotlin-stdlib-1.6.0.jar"
+          "url": "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.10/kotlin-stdlib-1.6.10.jar"
         }
       },
-      "name": "org.jetbrains.kotlin:kotlin-stdlib:1.6.0"
+      "name": "org.jetbrains.kotlin:kotlin-stdlib:1.6.10"
     },
     {
       "downloads": {
         "artifact": {
-          "path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.6.0/kotlin-stdlib-common-1.6.0.jar",
-          "sha1": "7857e365f925cfa060f941c1357cda1f8790502c",
-          "size": 200616,
-          "url": "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.0/kotlin-stdlib-common-1.6.0.jar"
+          "path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.6.10/kotlin-stdlib-common-1.6.10.jar",
+          "sha1": "0c118700e3a33c8a0d9adc920e9dec0831171925",
+          "size": 200617,
+          "url": "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.10/kotlin-stdlib-common-1.6.10.jar"
         }
       },
-      "name": "org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0"
+      "name": "org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10"
     },
     {
       "downloads": {