diff --git a/build.gradle b/build.gradle index 7f78e0e24..7770de3c3 100644 --- a/build.gradle +++ b/build.gradle @@ -229,19 +229,20 @@ subprojects { p -> } } - // Tells gradle where to look for other modules - // Why isn't the classpath added to the modules path by default? - if (p == project(":core")) { - compileJava { - inputs.property('moduleName', 'dhApi') - doFirst { - options.compilerArgs = [ - '--module-path', classpath.asPath - ] - classpath = files() - } - } - } + // this can be un-commented if we ever wanted to make DH modular (AKA use a module-info.java file) again +// // Tells gradle where to look for other modules +// // Why isn't the classpath added to the modules path by default? +// if (p == project(":core")) { +// compileJava { +// inputs.property('moduleName', 'dhApi') +// doFirst { +// options.compilerArgs = [ +// '--module-path', classpath.asPath +// ] +// classpath = files() +// } +// } +// } // Run mergeJars when running build build.finalizedBy(mergeJars) diff --git a/core b/core index 63309e1fb..e2d90f662 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 63309e1fb3c5dfa7d1db6b0567af585ee9deb021 +Subproject commit e2d90f6627bc86d7f4d0223a39539598b6af7daa