Skip to content

Commit 6ec8c08

Browse files
committed
Minor changes for dev plugin.
1 parent 4ba1ba2 commit 6ec8c08

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

common/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ final File buildConfigSrc = new File(buildDir,
2525
"generated/sources/foxloader/com/fox2code/foxloader/launcher/BuildConfig.java")
2626

2727
static void generateBuildConfig0(File buildConfigSrc, Project project) {
28+
buildConfigSrc.getParentFile().mkdirs()
2829
final String FOXLOADER_VERSION = project['foxloader.version']
2930
final String SPARK_DEPENDENCY = project['spark.dependency']
3031
final String REINDEV_VERSION = project['reindev.version']
@@ -56,7 +57,6 @@ tasks.register('generateBuildConfig') {
5657
}
5758

5859
if (!buildConfigSrc.exists()) {
59-
buildConfigSrc.getParentFile().mkdirs()
6060
generateBuildConfig0(buildConfigSrc, project)
6161
}
6262

dev/src/main/groovy/com/fox2code/foxloader/dev/GradlePlugin.groovy

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@ class GradlePlugin implements Plugin<Project> {
129129
process(project, foxLoaderCache, config)
130130
final String foxLoaderVersion = config.localTesting ?
131131
"1.0" : BuildConfig.FOXLOADER_VERSION // Full release will be 1.0.0 to avoid conflicts.
132+
if (config.foxLoaderLibVersionOverride != null) {
133+
foxLoaderVersion = config.foxLoaderLibVersionOverride
134+
}
132135
project.dependencies {
133136
runtimeOnly(BuildConfig.SPARK_DEPENDENCY)
134137
implementation("com.github.Fox2Code.FoxLoader:common:${foxLoaderVersion}")
@@ -283,8 +286,6 @@ class GradlePlugin implements Plugin<Project> {
283286

284287
static class FoxLoaderConfig {
285288
boolean decompileSources = true
286-
boolean localTesting = false
287-
boolean forceReload = false
288289
boolean includeClient = true
289290
boolean includeServer = true
290291
String username = Normalizer.normalize(System.getProperty("user.name"),
@@ -298,5 +299,9 @@ class GradlePlugin implements Plugin<Project> {
298299
public String modDesc
299300
public String modWebsite
300301
public String preClassTransformer
302+
// Fox testing only
303+
public String foxLoaderLibVersionOverride
304+
boolean localTesting = false
305+
boolean forceReload = false
301306
}
302307
}

0 commit comments

Comments
 (0)