Browse Source

Fix Build by specifying an API Version for the Gradle API

MeFisto94 5 years ago
parent
commit
4e577d6de1

+ 6 - 8
jme3-core/nbproject/project.xml

@@ -160,20 +160,18 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <!--<release-version>0</release-version>-->
-                        <!--<specification-version>1.0.2</specification-version>-->
-                        <implementation-version/>
+                        <release-version>1</release-version>
+                        <specification-version>1.5</specification-version>
                     </run-dependency>
                 </dependency>
-                <!-- <dependency>
+                <dependency>
                     <code-name-base>org.netbeans.modules.gradle.java</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
-                    <run-dependency>-->
-                        <!-- <release-version>1</release-version>-->
-                        <!--<specification-version>1.0.2</specification-version>
+                    <run-dependency>
+                        <specification-version>1.5</specification-version>
                     </run-dependency>
-                </dependency>-->
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.java.api.common</code-name-base>
                     <build-prerequisite/>

+ 6 - 2
jme3-core/src/com/jme3/gde/core/assets/AssetsLookupProvider.java

@@ -42,7 +42,7 @@ import java.util.logging.Logger;
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.ProjectManager;
 import org.netbeans.api.project.ProjectUtils;
-import org.netbeans.modules.gradle.NbGradleProjectImpl;
+import org.netbeans.modules.gradle.api.GradleBaseProject;
 import org.netbeans.modules.java.j2seproject.J2SEProject;
 import org.netbeans.modules.java.j2seproject.api.J2SEPropertyEvaluator;
 import org.netbeans.spi.project.LookupProvider;
@@ -97,7 +97,11 @@ public class AssetsLookupProvider implements LookupProvider {
     public Lookup createAdditionalLookup(Lookup lookup) {
         Project prj = lookup.lookup(Project.class);
         project = prj;
-        if (project instanceof NbGradleProjectImpl) {
+        if (project.getClass().getSimpleName().equals("NbGradleProjectImpl")) {
+            GradleBaseProject gradle = GradleBaseProject.get(project);
+            if (gradle.getSubProjects().containsKey("assets")) {
+                logger.log(Level.FINE, "Found assets subproject, extending with ProjectAssetManager");
+            }
             return Lookups.fixed();
         } else {
             FileObject assetsProperties = prj.getProjectDirectory().getFileObject("nbproject/project.properties");