From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Sat, 18 Jan 2020 23:25:45 +0000 (+0200)
Subject: Fixing code to compile with latest master.
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=20c8e7027b166fbcac46b6c763a0625a65e57c22;p=simantics%2Fsysdyn.git

Fixing code to compile with latest master.

gitlab simantics/platform#405
---

diff --git a/bundles/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Sheet.java b/bundles/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Sheet.java
index 7a27fd24..aca73a16 100644
--- a/bundles/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Sheet.java
+++ b/bundles/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Sheet.java
@@ -36,7 +36,7 @@ import org.simantics.objmap.annotations.RelatedElement;
 import org.simantics.objmap.annotations.UpdateMethod;
 import org.simantics.spreadsheet.Range;
 import org.simantics.spreadsheet.SheetVariables;
-import org.simantics.spreadsheet.common.exception.CellParseException;
+import org.simantics.spreadsheet.CellParseException;
 import org.simantics.spreadsheet.resource.SpreadsheetResource;
 import org.simantics.spreadsheet.util.SpreadsheetUtils;
 import org.simantics.sysdyn.representation.visitors.IElementVisitorVoid;
diff --git a/releng/org.simantics.sysdyn.tycho.configuration/pom.xml b/releng/org.simantics.sysdyn.tycho.configuration/pom.xml
index e68d2001..843afbab 100644
--- a/releng/org.simantics.sysdyn.tycho.configuration/pom.xml
+++ b/releng/org.simantics.sysdyn.tycho.configuration/pom.xml
@@ -8,8 +8,8 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<tycho.version>1.0.0</tycho.version>
-		<tycho.extras.version>1.0.0</tycho.extras.version>
+		<tycho.version>1.4.0</tycho.version>
+		<tycho.extras.version>1.4.0</tycho.extras.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<branch-spec>master</branch-spec>
 		<simantics-download-site>http://www.simantics.org/download</simantics-download-site>
@@ -76,11 +76,6 @@
 					<resolver>p2</resolver>
 					<environments>
 <!--
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86</arch>
-						</environment>
 						<environment>
 							<os>linux</os>
 							<ws>gtk</ws>