Switch to Gradle.

TomasMikula · Mar 4, 2014 · 381e43f · 381e43f
1 parent 70080c3
commit 381e43f
Show file tree

Hide file tree

Showing 79 changed files with 64 additions and 100 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,2 @@
+.gradle/
 build/
-dist/
-javadoc/
-build.properties
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013, Tomas Mikula
+Copyright (c) 2013-2014, Tomas Mikula
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

diff --git a/build.gradle b/build.gradle
@@ -0,0 +1,12 @@
+subprojects {
+    apply plugin: 'java'
+
+    repositories {
+        mavenCentral()
+    }
+
+    version = "1.0.0-SNAPSHOT"
+
+    sourceCompatibility = '1.8'
+    targetCompatibility = '1.8'
+}
diff --git a/build.properties.example b/build.properties.example
diff --git a/build.xml b/build.xml
diff --git a/reactfx-demos/.classpath b/reactfx-demos/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java" output="build/classes/main"/>
+	<classpathentry exported="true" kind="src" path="/reactfx"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
diff --git a/reactfx-demos/.project b/reactfx-demos/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>reactfx-demos</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/reactfx-demos/build.gradle b/reactfx-demos/build.gradle
@@ -0,0 +1,21 @@
+dependencies {
+    compile project(":reactfx")
+}
+
+task fatJar(type: Jar, dependsOn: classes) {
+    appendix = 'fat'
+    from sourceSets.main.output
+    from { configurations.runtime.collect { it.isDirectory() ? it : zipTree(it) } }
+}
+
+assemble.dependsOn fatJar
+
+task AndGateDemo(type: JavaExec, dependsOn: classes) {
+    main = 'reactfx.inhibeans.demo.AndGateDemo'
+    classpath = files(sourceSets.main.output, configurations.runtime)
+}
+
+task FibTest(type: JavaExec, dependsOn: classes) {
+    main = 'reactfx.inhibeans.demo.FibTest'
+    classpath = files(sourceSets.main.output, configurations.runtime)
+}
diff --git a/...a/reactfx/inhibeans/demo/AndGateDemo.java → ...a/reactfx/inhibeans/demo/AndGateDemo.java b/...a/reactfx/inhibeans/demo/AndGateDemo.java → ...a/reactfx/inhibeans/demo/AndGateDemo.java
diff --git a/.../java/reactfx/inhibeans/demo/FibTest.java → .../java/reactfx/inhibeans/demo/FibTest.java b/.../java/reactfx/inhibeans/demo/FibTest.java → .../java/reactfx/inhibeans/demo/FibTest.java
diff --git a/.classpath → reactfx/.classpath b/.classpath → reactfx/.classpath
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/demo/java"/>
+	<classpathentry kind="src" path="src/main/java" output="build/classes/main"/>
+	<classpathentry kind="src" path="src/test/java" output="build/classes/test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/.project → reactfx/.project b/.project → reactfx/.project
diff --git a/reactfx/build.gradle b/reactfx/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.+'
+}
diff --git a/src/main/java/reactfx/Change.java → reactfx/src/main/java/reactfx/Change.java b/src/main/java/reactfx/Change.java → reactfx/src/main/java/reactfx/Change.java
diff --git a/...a/reactfx/ContemporaryReducingStream.java → ...a/reactfx/ContemporaryReducingStream.java b/...a/reactfx/ContemporaryReducingStream.java → ...a/reactfx/ContemporaryReducingStream.java
diff --git a/src/main/java/reactfx/EventSource.java → ...fx/src/main/java/reactfx/EventSource.java b/src/main/java/reactfx/EventSource.java → ...fx/src/main/java/reactfx/EventSource.java
diff --git a/src/main/java/reactfx/EventStream.java → ...fx/src/main/java/reactfx/EventStream.java b/src/main/java/reactfx/EventStream.java → ...fx/src/main/java/reactfx/EventStream.java
diff --git a/src/main/java/reactfx/EventStreamBase.java → ...rc/main/java/reactfx/EventStreamBase.java b/src/main/java/reactfx/EventStreamBase.java → ...rc/main/java/reactfx/EventStreamBase.java
diff --git a/src/main/java/reactfx/EventStreams.java → ...x/src/main/java/reactfx/EventStreams.java b/src/main/java/reactfx/EventStreams.java → ...x/src/main/java/reactfx/EventStreams.java
diff --git a/src/main/java/reactfx/Hold.java → reactfx/src/main/java/reactfx/Hold.java b/src/main/java/reactfx/Hold.java → reactfx/src/main/java/reactfx/Hold.java
diff --git a/src/main/java/reactfx/Indicator.java → reactfx/src/main/java/reactfx/Indicator.java b/src/main/java/reactfx/Indicator.java → reactfx/src/main/java/reactfx/Indicator.java
diff --git a/...ava/reactfx/InterceptableEventStream.java → ...ava/reactfx/InterceptableEventStream.java b/...ava/reactfx/InterceptableEventStream.java → ...ava/reactfx/InterceptableEventStream.java
diff --git a/...reactfx/InterceptableEventStreamImpl.java → ...reactfx/InterceptableEventStreamImpl.java b/...reactfx/InterceptableEventStreamImpl.java → ...reactfx/InterceptableEventStreamImpl.java
diff --git a/src/main/java/reactfx/LazilyBoundStream.java → .../main/java/reactfx/LazilyBoundStream.java b/src/main/java/reactfx/LazilyBoundStream.java → .../main/java/reactfx/LazilyBoundStream.java
diff --git a/src/main/java/reactfx/ListHelper.java → ...tfx/src/main/java/reactfx/ListHelper.java b/src/main/java/reactfx/ListHelper.java → ...tfx/src/main/java/reactfx/ListHelper.java
diff --git a/src/main/java/reactfx/ReductionResult.java → ...rc/main/java/reactfx/ReductionResult.java b/src/main/java/reactfx/ReductionResult.java → ...rc/main/java/reactfx/ReductionResult.java
diff --git a/src/main/java/reactfx/Sink.java → reactfx/src/main/java/reactfx/Sink.java b/src/main/java/reactfx/Sink.java → reactfx/src/main/java/reactfx/Sink.java
diff --git a/src/main/java/reactfx/StreamBoundValue.java → ...c/main/java/reactfx/StreamBoundValue.java b/src/main/java/reactfx/StreamBoundValue.java → ...c/main/java/reactfx/StreamBoundValue.java
diff --git a/src/main/java/reactfx/Subscription.java → ...x/src/main/java/reactfx/Subscription.java b/src/main/java/reactfx/Subscription.java → ...x/src/main/java/reactfx/Subscription.java
diff --git a/src/main/java/reactfx/ThreadBridge.java → ...x/src/main/java/reactfx/ThreadBridge.java b/src/main/java/reactfx/ThreadBridge.java → ...x/src/main/java/reactfx/ThreadBridge.java
diff --git a/...in/java/reactfx/inhibeans/Observable.java → ...in/java/reactfx/inhibeans/Observable.java b/...in/java/reactfx/inhibeans/Observable.java → ...in/java/reactfx/inhibeans/Observable.java
diff --git a/...ava/reactfx/inhibeans/ObservableBase.java → ...ava/reactfx/inhibeans/ObservableBase.java b/...ava/reactfx/inhibeans/ObservableBase.java → ...ava/reactfx/inhibeans/ObservableBase.java
diff --git a/...va/reactfx/inhibeans/binding/Binding.java → ...va/reactfx/inhibeans/binding/Binding.java b/...va/reactfx/inhibeans/binding/Binding.java → ...va/reactfx/inhibeans/binding/Binding.java
diff --git a/...tfx/inhibeans/binding/BooleanBinding.java → ...tfx/inhibeans/binding/BooleanBinding.java b/...tfx/inhibeans/binding/BooleanBinding.java → ...tfx/inhibeans/binding/BooleanBinding.java
diff --git a/...ctfx/inhibeans/binding/DoubleBinding.java → ...ctfx/inhibeans/binding/DoubleBinding.java b/...ctfx/inhibeans/binding/DoubleBinding.java → ...ctfx/inhibeans/binding/DoubleBinding.java
diff --git a/...actfx/inhibeans/binding/FloatBinding.java → ...actfx/inhibeans/binding/FloatBinding.java b/...actfx/inhibeans/binding/FloatBinding.java → ...actfx/inhibeans/binding/FloatBinding.java
diff --git a/...tfx/inhibeans/binding/IntegerBinding.java → ...tfx/inhibeans/binding/IntegerBinding.java b/...tfx/inhibeans/binding/IntegerBinding.java → ...tfx/inhibeans/binding/IntegerBinding.java
diff --git a/...eactfx/inhibeans/binding/LongBinding.java → ...eactfx/inhibeans/binding/LongBinding.java b/...eactfx/inhibeans/binding/LongBinding.java → ...eactfx/inhibeans/binding/LongBinding.java
diff --git a/...ctfx/inhibeans/binding/ObjectBinding.java → ...ctfx/inhibeans/binding/ObjectBinding.java b/...ctfx/inhibeans/binding/ObjectBinding.java → ...ctfx/inhibeans/binding/ObjectBinding.java
diff --git a/...ctfx/inhibeans/binding/StringBinding.java → ...ctfx/inhibeans/binding/StringBinding.java b/...ctfx/inhibeans/binding/StringBinding.java → ...ctfx/inhibeans/binding/StringBinding.java
diff --git a/...hibeans/property/BooleanPropertyBase.java → ...hibeans/property/BooleanPropertyBase.java b/...hibeans/property/BooleanPropertyBase.java → ...hibeans/property/BooleanPropertyBase.java
diff --git a/...nhibeans/property/DoublePropertyBase.java → ...nhibeans/property/DoublePropertyBase.java b/...nhibeans/property/DoublePropertyBase.java → ...nhibeans/property/DoublePropertyBase.java
diff --git a/...inhibeans/property/FloatPropertyBase.java → ...inhibeans/property/FloatPropertyBase.java b/...inhibeans/property/FloatPropertyBase.java → ...inhibeans/property/FloatPropertyBase.java
diff --git a/...hibeans/property/IntegerPropertyBase.java → ...hibeans/property/IntegerPropertyBase.java b/...hibeans/property/IntegerPropertyBase.java → ...hibeans/property/IntegerPropertyBase.java
diff --git a/.../inhibeans/property/LongPropertyBase.java → .../inhibeans/property/LongPropertyBase.java b/.../inhibeans/property/LongPropertyBase.java → .../inhibeans/property/LongPropertyBase.java
diff --git a/...nhibeans/property/ObjectPropertyBase.java → ...nhibeans/property/ObjectPropertyBase.java b/...nhibeans/property/ObjectPropertyBase.java → ...nhibeans/property/ObjectPropertyBase.java
diff --git a/.../reactfx/inhibeans/property/Property.java → .../reactfx/inhibeans/property/Property.java b/.../reactfx/inhibeans/property/Property.java → .../reactfx/inhibeans/property/Property.java
diff --git a/...property/ReadOnlyBooleanPropertyBase.java → ...property/ReadOnlyBooleanPropertyBase.java b/...property/ReadOnlyBooleanPropertyBase.java → ...property/ReadOnlyBooleanPropertyBase.java
diff --git a/...eans/property/ReadOnlyBooleanWrapper.java → ...eans/property/ReadOnlyBooleanWrapper.java b/...eans/property/ReadOnlyBooleanWrapper.java → ...eans/property/ReadOnlyBooleanWrapper.java
diff --git a/.../property/ReadOnlyDoublePropertyBase.java → .../property/ReadOnlyDoublePropertyBase.java b/.../property/ReadOnlyDoublePropertyBase.java → .../property/ReadOnlyDoublePropertyBase.java
diff --git a/...beans/property/ReadOnlyDoubleWrapper.java → ...beans/property/ReadOnlyDoubleWrapper.java b/...beans/property/ReadOnlyDoubleWrapper.java → ...beans/property/ReadOnlyDoubleWrapper.java
diff --git a/...s/property/ReadOnlyFloatPropertyBase.java → ...s/property/ReadOnlyFloatPropertyBase.java b/...s/property/ReadOnlyFloatPropertyBase.java → ...s/property/ReadOnlyFloatPropertyBase.java
diff --git a/...ibeans/property/ReadOnlyFloatWrapper.java → ...ibeans/property/ReadOnlyFloatWrapper.java b/...ibeans/property/ReadOnlyFloatWrapper.java → ...ibeans/property/ReadOnlyFloatWrapper.java
diff --git a/...property/ReadOnlyIntegerPropertyBase.java → ...property/ReadOnlyIntegerPropertyBase.java b/...property/ReadOnlyIntegerPropertyBase.java → ...property/ReadOnlyIntegerPropertyBase.java
diff --git a/...eans/property/ReadOnlyIntegerWrapper.java → ...eans/property/ReadOnlyIntegerWrapper.java b/...eans/property/ReadOnlyIntegerWrapper.java → ...eans/property/ReadOnlyIntegerWrapper.java
diff --git a/...ns/property/ReadOnlyLongPropertyBase.java → ...ns/property/ReadOnlyLongPropertyBase.java b/...ns/property/ReadOnlyLongPropertyBase.java → ...ns/property/ReadOnlyLongPropertyBase.java
diff --git a/...hibeans/property/ReadOnlyLongWrapper.java → ...hibeans/property/ReadOnlyLongWrapper.java b/...hibeans/property/ReadOnlyLongWrapper.java → ...hibeans/property/ReadOnlyLongWrapper.java
diff --git a/.../property/ReadOnlyObjectPropertyBase.java → .../property/ReadOnlyObjectPropertyBase.java b/.../property/ReadOnlyObjectPropertyBase.java → .../property/ReadOnlyObjectPropertyBase.java
diff --git a/...beans/property/ReadOnlyObjectWrapper.java → ...beans/property/ReadOnlyObjectWrapper.java b/...beans/property/ReadOnlyObjectWrapper.java → ...beans/property/ReadOnlyObjectWrapper.java
diff --git a/.../property/ReadOnlyStringPropertyBase.java → .../property/ReadOnlyStringPropertyBase.java b/.../property/ReadOnlyStringPropertyBase.java → .../property/ReadOnlyStringPropertyBase.java
diff --git a/...beans/property/ReadOnlyStringWrapper.java → ...beans/property/ReadOnlyStringWrapper.java b/...beans/property/ReadOnlyStringWrapper.java → ...beans/property/ReadOnlyStringWrapper.java
diff --git a/...beans/property/SimpleBooleanProperty.java → ...beans/property/SimpleBooleanProperty.java b/...beans/property/SimpleBooleanProperty.java → ...beans/property/SimpleBooleanProperty.java
diff --git a/...ibeans/property/SimpleDoubleProperty.java → ...ibeans/property/SimpleDoubleProperty.java b/...ibeans/property/SimpleDoubleProperty.java → ...ibeans/property/SimpleDoubleProperty.java
diff --git a/...hibeans/property/SimpleFloatProperty.java → ...hibeans/property/SimpleFloatProperty.java b/...hibeans/property/SimpleFloatProperty.java → ...hibeans/property/SimpleFloatProperty.java
diff --git a/...beans/property/SimpleIntegerProperty.java → ...beans/property/SimpleIntegerProperty.java b/...beans/property/SimpleIntegerProperty.java → ...beans/property/SimpleIntegerProperty.java
diff --git a/...nhibeans/property/SimpleLongProperty.java → ...nhibeans/property/SimpleLongProperty.java b/...nhibeans/property/SimpleLongProperty.java → ...nhibeans/property/SimpleLongProperty.java
diff --git a/...ibeans/property/SimpleObjectProperty.java → ...ibeans/property/SimpleObjectProperty.java b/...ibeans/property/SimpleObjectProperty.java → ...ibeans/property/SimpleObjectProperty.java
diff --git a/...ibeans/property/SimpleStringProperty.java → ...ibeans/property/SimpleStringProperty.java b/...ibeans/property/SimpleStringProperty.java → ...ibeans/property/SimpleStringProperty.java
diff --git a/...nhibeans/property/StringPropertyBase.java → ...nhibeans/property/StringPropertyBase.java b/...nhibeans/property/StringPropertyBase.java → ...nhibeans/property/StringPropertyBase.java
diff --git a/...ctfx/inhibeans/value/ObservableValue.java → ...ctfx/inhibeans/value/ObservableValue.java b/...ctfx/inhibeans/value/ObservableValue.java → ...ctfx/inhibeans/value/ObservableValue.java
diff --git a/.../inhibeans/value/ObservableValueBase.java → .../inhibeans/value/ObservableValueBase.java b/.../inhibeans/value/ObservableValueBase.java → .../inhibeans/value/ObservableValueBase.java
diff --git a/src/test/java/reactfx/IndicatorTest.java → .../src/test/java/reactfx/IndicatorTest.java b/src/test/java/reactfx/IndicatorTest.java → .../src/test/java/reactfx/IndicatorTest.java
diff --git a/...reactfx/InterceptableEventStreamTest.java → ...reactfx/InterceptableEventStreamTest.java b/...reactfx/InterceptableEventStreamTest.java → ...reactfx/InterceptableEventStreamTest.java
diff --git a/.../java/reactfx/ReduceContemporaryTest.java → .../java/reactfx/ReduceContemporaryTest.java b/.../java/reactfx/ReduceContemporaryTest.java → .../java/reactfx/ReduceContemporaryTest.java
diff --git a/src/test/java/reactfx/ThreadBridgeTest.java → ...c/test/java/reactfx/ThreadBridgeTest.java b/src/test/java/reactfx/ThreadBridgeTest.java → ...c/test/java/reactfx/ThreadBridgeTest.java
diff --git a/.../inhibeans/property/CountingListener.java → .../inhibeans/property/CountingListener.java b/.../inhibeans/property/CountingListener.java → .../inhibeans/property/CountingListener.java
diff --git a/...ctfx/inhibeans/property/PropertyTest.java → ...ctfx/inhibeans/property/PropertyTest.java b/...ctfx/inhibeans/property/PropertyTest.java → ...ctfx/inhibeans/property/PropertyTest.java
diff --git a/...tfx/inhibeans/value/CountingListener.java → ...tfx/inhibeans/value/CountingListener.java b/...tfx/inhibeans/value/CountingListener.java → ...tfx/inhibeans/value/CountingListener.java
diff --git a/settings.gradle b/settings.gradle
@@ -0,0 +1 @@
+include "reactfx", "reactfx-demos"