From 36e669d729193047601a72c126b1d28f7d7a5b10 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 20 Apr 2017 14:49:32 +0200
Subject: [PATCH 1/2] Preparing 1.3.0-rc1

---
 main/ant-kit/pom.xml       | 2 +-
 main/commons/pom.xml       | 2 +-
 main/jacoco-report/pom.xml | 2 +-
 main/keychain/pom.xml      | 2 +-
 main/launcher/pom.xml      | 2 +-
 main/pom.xml               | 2 +-
 main/uber-jar/pom.xml      | 2 +-
 main/ui/pom.xml            | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml
index 015c80989..11109eed9 100644
--- a/main/ant-kit/pom.xml
+++ b/main/ant-kit/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.3.0-rc1</version>
 	</parent>
 	<artifactId>ant-kit</artifactId>
 	<packaging>pom</packaging>
diff --git a/main/commons/pom.xml b/main/commons/pom.xml
index 2ab70cf6e..534d6498c 100644
--- a/main/commons/pom.xml
+++ b/main/commons/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.3.0-rc1</version>
 	</parent>
 	<artifactId>commons</artifactId>
 	<name>Cryptomator Commons</name>
diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml
index 2079aed52..24513f5d5 100644
--- a/main/jacoco-report/pom.xml
+++ b/main/jacoco-report/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.3.0-rc1</version>
 	</parent>
 	<artifactId>jacoco-report</artifactId>
 	<name>Cryptomator Code Coverage Report</name>
diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml
index d5429fb69..2f4c0f95e 100644
--- a/main/keychain/pom.xml
+++ b/main/keychain/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.3.0-rc1</version>
 	</parent>
 	<artifactId>keychain</artifactId>
 	<name>System Keychain Access</name>
diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml
index 25ff891e7..b5c52bd93 100644
--- a/main/launcher/pom.xml
+++ b/main/launcher/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.3.0-rc1</version>
 	</parent>
 	<artifactId>launcher</artifactId>
 	<name>Cryptomator Launcher</name>
diff --git a/main/pom.xml b/main/pom.xml
index 661f652b1..4e92fde63 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>main</artifactId>
-	<version>1.3.0-SNAPSHOT</version>
+	<version>1.3.0-rc1</version>
 	<packaging>pom</packaging>
 	<name>Cryptomator</name>
 
diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml
index a16e82cb2..511ddaf2a 100644
--- a/main/uber-jar/pom.xml
+++ b/main/uber-jar/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.3.0-rc1</version>
 	</parent>
 	<artifactId>uber-jar</artifactId>
 	<name>Single über jar with all dependencies</name>
diff --git a/main/ui/pom.xml b/main/ui/pom.xml
index 1e13bbf25..f55f6d217 100644
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.3.0-rc1</version>
 	</parent>
 	<artifactId>ui</artifactId>
 	<name>Cryptomator GUI</name>

From 0d03eeb5bd31b188575b83d69d03af4908afa810 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 20 Apr 2017 15:02:29 +0200
Subject: [PATCH 2/2] Adjusted build config for 1.3.0

---
 main/ant-kit/pom.xml                      |  2 +-
 main/ant-kit/src/main/resources/build.xml | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml
index 11109eed9..ec6fe4c6a 100644
--- a/main/ant-kit/pom.xml
+++ b/main/ant-kit/pom.xml
@@ -18,7 +18,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.cryptomator</groupId>
-			<artifactId>ui</artifactId>
+			<artifactId>launcher</artifactId>
 		</dependency>
 	</dependencies>
 
diff --git a/main/ant-kit/src/main/resources/build.xml b/main/ant-kit/src/main/resources/build.xml
index 6dce44b1e..55b8624a1 100644
--- a/main/ant-kit/src/main/resources/build.xml
+++ b/main/ant-kit/src/main/resources/build.xml
@@ -3,15 +3,15 @@
 	<taskdef uri="javafx:com.sun.javafx.tools.ant" resource="com/sun/javafx/tools/ant/antlib.xml" classpath="\${java.class.path}:\${java.home}/../lib/ant-javafx.jar:." />
 	
 	<!-- Define application to build -->
-	<fx:application id="Cryptomator" name="Cryptomator" version="${project.version}" mainClass="org.cryptomator.ui.Cryptomator" />
+	<fx:application id="Cryptomator" name="Cryptomator" version="${project.version}" mainClass="org.cryptomator.launcher.Cryptomator" />
 	
 	<!-- Create main application jar -->
 	<target name="create-jar">
 		<fx:jar destfile="antbuild/Cryptomator-${project.version}.jar">
 			<fx:application refid="Cryptomator" />
-			<fx:fileset dir="libs" includes="ui-${project.version}.jar" />
+			<fx:fileset dir="libs" includes="launcher-${project.version}.jar" />
 			<fx:resources>
-				<fx:fileset dir="libs" type="jar" includes="*.jar" excludes="ui-${project.version}.jar" />
+				<fx:fileset dir="libs" type="jar" includes="*.jar" excludes="launcher-${project.version}.jar" />
 			</fx:resources>
 			<fx:manifest>
 				<fx:attribute name="Implementation-Vendor" value="cryptomator.org" />
@@ -32,11 +32,12 @@
 				<fx:property name="cryptomator.logPath" value="~/.Cryptomator/cryptomator.log" />
 				<fx:property name="cryptomator.upgradeLogPath" value="~/.Cryptomator/upgrade.log" />
 				<fx:property name="cryptomator.settingsPath" value="~/.Cryptomator/settings.json" />
+				<fx:property name="cryptomator.ipcPortPath" value="~/.Cryptomator/ipcPort.bin" />
 				<fx:jvmarg value="-Xmx512m"/>
 			</fx:platform>
 			<fx:resources>
 				<fx:fileset dir="antbuild" type="jar" includes="Cryptomator-${project.version}.jar" />
-				<fx:fileset dir="libs" type="jar" includes="*.jar" excludes="ui-${project.version}.jar"/>
+				<fx:fileset dir="libs" type="jar" includes="*.jar" excludes="launcher-${project.version}.jar"/>
 				<fx:fileset dir="fixed-binaries" type="data" includes="linux-launcher-*" arch=""/>
 			</fx:resources>
 			<fx:permissions elevated="false" />
@@ -55,11 +56,12 @@
 				<fx:property name="cryptomator.logPath" value="~/.Cryptomator/cryptomator.log" />
 				<fx:property name="cryptomator.upgradeLogPath" value="~/.Cryptomator/upgrade.log" />
 				<fx:property name="cryptomator.settingsPath" value="~/.Cryptomator/settings.json" />
+				<fx:property name="cryptomator.ipcPortPath" value="~/.Cryptomator/ipcPort.bin" />
 				<fx:jvmarg value="-Xmx512m"/>
 			</fx:platform>
 			<fx:resources>
 				<fx:fileset dir="antbuild" type="jar" includes="Cryptomator-${project.version}.jar" />
-				<fx:fileset dir="libs" type="jar" includes="*.jar" excludes="ui-${project.version}.jar"/>
+				<fx:fileset dir="libs" type="jar" includes="*.jar" excludes="launcher-${project.version}.jar"/>
 				<fx:fileset dir="fixed-binaries" type="data" includes="linux-launcher-*" arch=""/>
 			</fx:resources>
 			<fx:permissions elevated="false" />