Parcourir la source

Update build.gradle file and commit versions of .project/.classpath generated by Eclipse's buildship

smelc il y a 6 ans
Parent
commit
453dd6f94c
5 fichiers modifiés avec 26 ajouts et 34 suppressions
  1. 6 18
      .classpath
  2. 12 10
      .project
  3. BIN
      assets.zip
  4. 8 3
      build.gradle
  5. 0 3
      settings.gradle

+ 6 - 18
.classpath

@@ -1,21 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="squidlib/src/main/java">
-		<attributes>
-			<attribute name="FROM_GRADLE_MODEL" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="squidlib-util/src/main/java">
-		<attributes>
-			<attribute name="FROM_GRADLE_MODEL" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="squidlib-util/src/main/resources">
-		<attributes>
-			<attribute name="FROM_GRADLE_MODEL" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry path="bin" kind="output"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry sourcepath="/home/churlin/.gradle/caches/modules-2/files-2.1/com.badlogicgames.gdx/gdx/1.9.6/7d903ecd6b0df2ec334814b8e70618e4c93fd37c/gdx-1.9.6-sources.jar" kind="lib" path="/home/churlin/.gradle/caches/modules-2/files-2.1/com.badlogicgames.gdx/gdx/1.9.6/47d1e9b890e364ec28f128e9bb3b9a12a94c164/gdx-1.9.6.jar"/>
+	<classpathentry kind="src" path="squidlib/src/main/java"/>
+	<classpathentry kind="src" path="squidlib-util/src/main/java"/>
+	<classpathentry kind="src" path="squidlib-util/src/main/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>

+ 12 - 10
.project

@@ -2,27 +2,29 @@
 <projectDescription>
 	<name>SquidLib</name>
 	<comment></comment>
-	<projects/>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
+	<projects>
+	</projects>
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments/>
+			<arguments>
+			</arguments>
 		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments/>
+			<arguments>
+			</arguments>
 		</buildCommand>
 	</buildSpec>
-	<linkedResources/>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
 	<filteredResources>
 		<filter>
 			<id>1</id>
+			<name></name>
 			<type>26</type>
-			<name/>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
 				<arguments>1.0-projectRelativePath-matches-false-false-build</arguments>
@@ -30,8 +32,8 @@
 		</filter>
 		<filter>
 			<id>2</id>
+			<name></name>
 			<type>26</type>
-			<name/>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
 				<arguments>1.0-projectRelativePath-matches-false-false-.gradle</arguments>

BIN
assets.zip


+ 8 - 3
build.gradle

@@ -1,7 +1,9 @@
 apply plugin: 'java'
-apply plugin: 'eclipse'
-// note from smelC: I did not add a plugin for 'idea' as I don't use it. 
-// Please add it if you do.
+// note from smelC: starting with Eclipse Neon, you should not use
+// gradle's Eclipse plugin. Instead you should use Eclipse's buildship project:
+// https://projects.eclipse.org/projects/tools.buildship
+// buildship takes care of generating .classpath and .project files according to your build.gradle files
+// (right-click on a project > Gradle > Refresh Gradle Project).
 
 // In this section you declare where to find the dependencies of your project
 repositories {
@@ -30,6 +32,9 @@ sourceSets {
 // 'gdxVersion' itself, and yet be able to build SquidLib standalone too.
 def gdxVersion = System.getenv("gdxVersion") ?: "1.9.6" // As in pom.xml
 
+targetCompatibility = '1.7'
+// sourceCompatibility = '1.6'  // For android. Commented because not honored (diamonds) :-(
+
 dependencies {
 	compile "com.badlogicgames.gdx:gdx:$gdxVersion"
 }

+ 0 - 3
settings.gradle

@@ -1,3 +0,0 @@
-include 'RegExodus'
-// This means RegExodus must be in a sibling directory
-project(':RegExodus').projectDir = new File('../RegExodus')