Commits

shemnon committed 05ef87d Merge

javadoc and sources jar
add rt.jar hack

  • Participants
  • Parent commits 0e1aeaf, 12f06e7

Comments (0)

Files changed (2)

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="samples"/>
-	<classpathentry kind="src" path="bugs"/>
-	<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.jdt.USER_LIBRARY/JavaFX 8.0"/>
-	<classpathentry kind="output" path="bin"/>
+    <classpathentry kind="src" path="src/main/java"/>
+    <classpathentry kind="src" path="src/main/resources"/>
+    <classpathentry kind="src" path="src/samples/java"/>
+    <classpathentry kind="src" path="src/samples/resources"/>
+    <classpathentry kind="src" path="src/test/java"/>
+    <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.jdt.USER_LIBRARY/JavaFX 8.0"/>
+    <classpathentry kind="output" path="bin"/>
 </classpath>
 apply plugin: 'maven'
 
 group = 'org.controlsfx'
-version = '0.0'
+version = '8.0.0-developer-preview-1'
 
 configurations {
     samples.extendsFrom mainRuntime
     }
 }
 
+<<<<<<< local
 javadoc {
     exclude 'impl/*'
+=======
+dependencies {
+    try {
+        compile files(jfxrtJar)
+    } catch (MissingPropertyException pne) {
+        compile files("${System.properties['java.home']}/lib/ext/jfxrt.jar")
+    }
+>>>>>>> other
 }
 
 task jarSamples (type: Jar) {