Fix build and tests

Author: DenWav

gradle/wrapper/gradle-wrapper.jar

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -11,6 +11,7 @@
 package com.demonwav.mcdev.framework
 
 import com.intellij.openapi.application.runWriteAction
+import com.intellij.openapi.project.rootManager
 import com.intellij.openapi.roots.ModuleRootModificationUtil
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VirtualFile
@@ -84,10 +85,10 @@ class ProjectBuilder(fixture: JavaCodeInsightTestFixture) {
         runWriteAction {
             VfsUtil.markDirtyAndRefresh(false, true, true, root)
             // Make sure to always add the module content root
-            ModuleRootModificationUtil.updateModel(fixture.module) { model ->
-                model.contentEntries.firstOrNull { it.file == project.baseDir } ?:
-                    model.addContentEntry(project.baseDir)
+            if (fixture.module.rootManager.contentEntries.none { it.file == project.baseDir }) {
+                ModuleRootModificationUtil.addContentRoot(fixture.module, project.baseDir)
             }
+
             builder()
         }
     }

src/test/kotlin/com/demonwav/mcdev/framework/ProjectBuilder.kt

@@ -10,24 +10,25 @@
 
 package com.demonwav.mcdev.framework
 
+import com.intellij.openapi.project.rootManager
 import com.intellij.openapi.roots.ModuleRootModificationUtil
+import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 
 abstract class ProjectBuilderTest : LightCodeInsightFixtureTestCase() {
 
     protected fun buildProject(builder: ProjectBuilder.() -> Unit) = ProjectBuilder(myFixture).build(builder)
 
     fun ProjectBuilder.src(block: ProjectBuilder.() -> Unit) {
-        dir("src", block)
-        ModuleRootModificationUtil.updateModel(myFixture.module) { model ->
-            val contentEntry = model.contentEntries.firstOrNull { it.file == project.baseDir } ?:
-                model.addContentEntry(project.baseDir)
-
-            val srcFolder = project.baseDir.findChild("src")!!
-            if (!contentEntry.sourceFolderFiles.contains(srcFolder)) {
-                contentEntry.addSourceFolder(srcFolder, false)
+        val srcFolder = VfsUtil.createDirectoryIfMissing(project.baseDir, "src")
+        val entry = myFixture.module.rootManager.contentEntries.first { it.file == project.baseDir }
+        if (!entry.sourceFolderFiles.contains(srcFolder)) {
+            ModuleRootModificationUtil.updateModel(myFixture.module) { model ->
+                model.contentEntries.first { it.file == project.baseDir }.addSourceFolder(srcFolder, false)
             }
         }
+
+        dir("src", block)
     }
 
     override fun tearDown() {

src/test/kotlin/com/demonwav/mcdev/framework/ProjectBuilderTest.kt

@@ -28,7 +28,7 @@ val mockJdk by lazy {
 }
 
 private fun findLibraryPath(name: String) = FileUtil.toSystemIndependentName(System.getProperty("testLibs.$name")!!)
-private fun findLibrary(name: String) = StandardFileSystems.jar().findFileByPath(findLibraryPath(name) + JarFileSystem.JAR_SEPARATOR)
+private fun findLibrary(name: String) = StandardFileSystems.jar().refreshAndFindFileByPath(findLibraryPath(name) + JarFileSystem.JAR_SEPARATOR)
 
 fun createLibrary(project: Project, name: String): Library {
     val table = LibraryTablesRegistrar.getInstance().getLibraryTable(project)

src/test/kotlin/com/demonwav/mcdev/framework/TestUtil.kt

@@ -25,11 +25,17 @@ abstract class BaseMixinTest : BaseMinecraftTest(PlatformType.MIXIN) {
     override fun setUp() {
         super.setUp()
 
+        runWriteTask {
+            library = createLibrary(project, "mixin")
+        }
+
         ModuleRootModificationUtil.updateModel(myModule) { model ->
-            runWriteTask {
-                library = createLibrary(project, "mixin")
-            }
             model.addLibraryEntry(library ?: throw IllegalStateException("Library not created"))
+            val orderEntries = model.orderEntries
+            val last = orderEntries.last()
+            System.arraycopy(orderEntries, 0, orderEntries, 1, orderEntries.size - 1)
+            orderEntries[0] = last
+            model.rearrangeOrderEntries(orderEntries)
         }
     }