mirror of
				https://github.com/SquidDev-CC/CC-Tweaked
				synced 2025-10-31 13:42:59 +00:00 
			
		
		
		
	Various Gradle tweaks
- Update Gradle to 8.7 - Configure IntelliJ to build internally, rather than delgating to Gradle. We've seen some weird issues with using delegated builds, so best avoided. - Remove gitpod config. This has been broken for a while (used Java 16 rather than 17) and nobody noticed, so I suspect nobody uses this.
This commit is contained in:
		
							
								
								
									
										26
									
								
								.gitpod.yml
									
									
									
									
									
								
							
							
						
						
									
										26
									
								
								.gitpod.yml
									
									
									
									
									
								
							| @@ -1,26 +0,0 @@ | |||||||
| # SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers |  | ||||||
| # |  | ||||||
| # SPDX-License-Identifier: MPL-2.0 |  | ||||||
|  |  | ||||||
| image: |  | ||||||
|   file: config/gitpod/Dockerfile |  | ||||||
|  |  | ||||||
| ports: |  | ||||||
|   - port: 25565 |  | ||||||
|     onOpen: notify |  | ||||||
|  |  | ||||||
| vscode: |  | ||||||
|   extensions: |  | ||||||
|     - eamodio.gitlens |  | ||||||
|     - github.vscode-pull-request-github |  | ||||||
|     - ms-azuretools.vscode-docker |  | ||||||
|     - redhat.java |  | ||||||
|     - richardwillis.vscode-gradle |  | ||||||
|     - vscjava.vscode-java-debug |  | ||||||
|     - vscode.github |  | ||||||
|  |  | ||||||
| tasks: |  | ||||||
|   - name: Setup pre-commit hool |  | ||||||
|     init: pre-commit install --allow-missing-config |  | ||||||
|   - name: Install npm packages |  | ||||||
|     init: npm ci |  | ||||||
| @@ -5,9 +5,8 @@ | |||||||
| import cc.tweaked.gradle.JUnitExt | import cc.tweaked.gradle.JUnitExt | ||||||
| import net.fabricmc.loom.api.LoomGradleExtensionAPI | import net.fabricmc.loom.api.LoomGradleExtensionAPI | ||||||
| import net.fabricmc.loom.util.gradle.SourceSetHelper | import net.fabricmc.loom.util.gradle.SourceSetHelper | ||||||
| import org.jetbrains.gradle.ext.compiler | import org.jetbrains.gradle.ext.* | ||||||
| import org.jetbrains.gradle.ext.runConfigurations | import org.jetbrains.gradle.ext.Application | ||||||
| import org.jetbrains.gradle.ext.settings |  | ||||||
| 
 | 
 | ||||||
| plugins { | plugins { | ||||||
|     publishing |     publishing | ||||||
| @@ -86,6 +85,19 @@ idea.project.settings.runConfigurations { | |||||||
|         moduleName = "${idea.project.name}.forge.test" |         moduleName = "${idea.project.name}.forge.test" | ||||||
|         packageName = "" |         packageName = "" | ||||||
|     } |     } | ||||||
|  | 
 | ||||||
|  |     register<Application>("Standalone") { | ||||||
|  |         moduleName = "${idea.project.name}.standalone.main" | ||||||
|  |         mainClass = "cc.tweaked.standalone.Main" | ||||||
|  |         programParameters = "--resources=projects/core/src/main/resources --term=80x30 --allow-local-domains" | ||||||
|  |     } | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | // Build with the IntelliJ, rather than through Gradle. This may require setting the "Compiler Output" option in | ||||||
|  | // "Project Structure". | ||||||
|  | idea.project.settings.delegateActions { | ||||||
|  |     delegateBuildRunToGradle = false | ||||||
|  |     testRunner = ActionDelegationConfig.TestRunner.PLATFORM | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| idea.project.settings.compiler.javac { | idea.project.settings.compiler.javac { | ||||||
|   | |||||||
| @@ -1,12 +0,0 @@ | |||||||
| # SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers |  | ||||||
| # |  | ||||||
| # SPDX-License-Identifier: MPL-2.0 |  | ||||||
|  |  | ||||||
| FROM gitpod/workspace-base |  | ||||||
|  |  | ||||||
| USER gitpod |  | ||||||
|  |  | ||||||
| RUN sudo apt-get -q update \ |  | ||||||
|  && sudo apt-get install -yq openjdk-16-jdk python3-pip npm \ |  | ||||||
|  && sudo pip3 install pre-commit \ |  | ||||||
|  && sudo update-java-alternatives --set java-1.16.0-openjdk-amd64 |  | ||||||
| @@ -60,7 +60,7 @@ curseForgeGradle = "1.0.14" | |||||||
| errorProne-core = "2.23.0" | errorProne-core = "2.23.0" | ||||||
| errorProne-plugin = "3.1.0" | errorProne-plugin = "3.1.0" | ||||||
| fabric-loom = "1.6.7" | fabric-loom = "1.6.7" | ||||||
| forgeGradle = "6.0.20" | forgeGradle = "6.0.21" | ||||||
| githubRelease = "2.5.2" | githubRelease = "2.5.2" | ||||||
| gradleVersions = "0.50.0" | gradleVersions = "0.50.0" | ||||||
| ideaExt = "1.1.7" | ideaExt = "1.1.7" | ||||||
| @@ -72,7 +72,7 @@ nullAway = "0.10.25" | |||||||
| spotless = "6.23.3" | spotless = "6.23.3" | ||||||
| taskTree = "2.1.1" | taskTree = "2.1.1" | ||||||
| teavm = "0.10.0-SQUID.4" | teavm = "0.10.0-SQUID.4" | ||||||
| vanillaExtract = "0.1.2" | vanillaExtract = "0.1.3" | ||||||
| versionCatalogUpdate = "0.8.1" | versionCatalogUpdate = "0.8.1" | ||||||
|  |  | ||||||
| [libraries] | [libraries] | ||||||
|   | |||||||
							
								
								
									
										
											BIN
										
									
								
								gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							| @@ -1,6 +1,6 @@ | |||||||
| distributionBase=GRADLE_USER_HOME | distributionBase=GRADLE_USER_HOME | ||||||
| distributionPath=wrapper/dists | distributionPath=wrapper/dists | ||||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip | distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip | ||||||
| networkTimeout=10000 | networkTimeout=10000 | ||||||
| validateDistributionUrl=true | validateDistributionUrl=true | ||||||
| zipStoreBase=GRADLE_USER_HOME | zipStoreBase=GRADLE_USER_HOME | ||||||
|   | |||||||
| @@ -183,7 +183,7 @@ function unset(name) | |||||||
| end | end | ||||||
|  |  | ||||||
| --- Resets the value of all settings. Equivalent to calling [`settings.unset`] | --- Resets the value of all settings. Equivalent to calling [`settings.unset`] | ||||||
| --- on every setting. | -- on every setting. | ||||||
| -- | -- | ||||||
| -- @see settings.unset | -- @see settings.unset | ||||||
| function clear() | function clear() | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Jonathan Coates
					Jonathan Coates