Skip to content

Commit 2b9bf50

Browse files
committed
Update buildscripts
1 parent d828c89 commit 2b9bf50

File tree

4 files changed

+47
-6
lines changed

4 files changed

+47
-6
lines changed

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010
// }
1111
maven {
1212
name = 'forge'
13-
url = 'http://files.minecraftforge.net/maven'
13+
url = 'http://maven.minecraftforge.net/'
1414
}
1515
maven {
1616
name = 'gradle'
@@ -31,7 +31,7 @@ buildscript {
3131
plugins {
3232
//id 'com.github.spotbugs' version '1.6.2'
3333
id 'com.matthewprenger.cursegradle' version '1.4.0'
34-
id 'org.sonarqube' version '3.0'
34+
id 'org.sonarqube' version '2.8'
3535
}
3636

3737
apply plugin: 'net.minecraftforge.gradle.forge'
@@ -234,10 +234,10 @@ repositories {
234234
name 'industrialcraft'
235235
url 'http://maven.ic2.player.to/'
236236
}
237-
maven { // HWYLA
237+
/* maven { // HWYLA
238238
name 'tehnut'
239239
url 'http://tehnut.info/maven/'
240-
}
240+
}*/
241241
maven { // CoFH
242242
name 'Covers Maven'
243243
url 'http://maven.covers1624.net/'

changelog.mustache

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{{#tags}}
2+
{{#issues}}
3+
{{#commits}}
4+
**{{{messageTitle}}}**
5+
{{#messageBodyItems}}
6+
* {{.}}
7+
{{/messageBodyItems}}
8+
{{/commits}}
9+
{{/issues}}
10+
{{/tags}}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ mc_version = 1.12
99

1010
fg_version = 2.3-SNAPSHOT
1111
forge_mc_version = 1.12.2
12-
forge_version = 14.23.5.2768
12+
forge_version = 14.23.5.2847
1313
mcp_mappings = stable_39
1414

1515
cf_project_id = 240967

settings.gradle

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,33 @@
1+
// Workaround to make the JUnit Platform Gradle Plugin available using the `plugins` DSL
2+
// See https://github.com/junit-team/junit5/issues/768
3+
if (!(GradleVersion.current() <= GradleVersion.version('2.14.1'))) {
4+
pluginManagement {
5+
repositories {
6+
gradlePluginPortal()
7+
maven { url = ArtifactRepositoryContainer.MAVEN_CENTRAL_URL }
8+
}
9+
resolutionStrategy {
10+
eachPlugin {
11+
if (requested.id.id == 'org.junit.platform.gradle.plugin') {
12+
useModule("org.junit.platform:junit-platform-gradle-plugin:${requested.version}")
13+
// } else if (requested.id.id == 'org.junit.platform.gradle.plugin') {
14+
// useModule("org.junit.platform:junit-platform-gradle-plugin:${requested.version}")
15+
}
16+
}
17+
}
18+
}
19+
}
20+
121
rootProject.name = archivesBaseName
2-
enableFeaturePreview('STABLE_PUBLISHING')
22+
import org.gradle.util.GradleVersion
23+
if ((GradleVersion.current() >= GradleVersion.version('4.8')) && (GradleVersion.current() <= GradleVersion.version('4.10.3'))) {
24+
enableFeaturePreview('STABLE_PUBLISHING') // 4.10.3
25+
}
26+
27+
// TODO: Things which likely don't work with FG yet, but I've not checked.
28+
/*
29+
if ((GradleVersion.current() >= GradleVersion.version('4.6')) && (GradleVersion.current() <= GradleVersion.version('4.10.3'))) {
30+
enableFeaturePreview('IMPROVED_POM_SUPPORT') // Previously -Dorg.gradle.advancedpomsupport=true
31+
enableFeaturePreview('GRADLE_METADATA') // Previously -Dorg.gradle.gradlemetadata=true
32+
}
33+
*/

0 commit comments

Comments
 (0)