Skip to content

Commit

Permalink
Merge pull request #114 from SlimerDude/feature/v1.1.2
Browse files Browse the repository at this point in the history 
Feature/v1.1.2
  • Loading branch information
@SlimerDude
SlimerDude authored Jul 24, 2019
2 parents 81a516d + 47fef23 commit b4aba9f
Show file tree
Hide file tree
Showing 64 changed files with 109 additions and 204 deletions.
2 changes: 1 addition & 1 deletion com.xored.f4.astView/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: F4 AstView
Bundle-SymbolicName: com.xored.f4.astView;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.1.2.qualifier
Bundle-Vendor: Xored software, Inc.
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion com.xored.f4.astView/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
</parent>
<groupId>com.xored.f4</groupId>
<artifactId>com.xored.f4.astView</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
4 changes: 2 additions & 2 deletions com.xored.f4.builder.ui/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: F4 Builder UI
Bundle-SymbolicName: com.xored.f4.builder.ui;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.1.2.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: Xored software, Inc.
Require-Bundle: org.fantom.sys,
org.fantom.concurrent,
com.xored.fanide.core;bundle-version="1.1.0",
com.xored.fanide.core;bundle-version="1.1.2",
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.ui,
Expand Down
2 changes: 1 addition & 1 deletion com.xored.f4.builder.ui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
</parent>
<groupId>com.xored.f4</groupId>
<artifactId>com.xored.f4.builder.ui</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
6 changes: 3 additions & 3 deletions com.xored.f4.builder/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: F4 Builder
Bundle-SymbolicName: com.xored.f4.builder;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.1.2.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.dltk.core,
org.eclipse.core.runtime,
Expand All @@ -17,8 +17,8 @@ Require-Bundle: org.eclipse.dltk.core,
org.fantom.compiler,
org.fantom.compilerJava,
com.xored.fantom.classfile;bundle-version="1.0.0",
com.xored.f4.core;bundle-version="1.1.0",
com.xored.f4.launching;bundle-version="1.1.0",
com.xored.f4.core;bundle-version="1.1.2",
com.xored.f4.launching;bundle-version="1.1.2",
org.fantom.concurrent,
org.eclipse.dltk.logconsole,
org.eclipse.core.externaltools;bundle-version="1.0.1"
Expand Down
2 changes: 1 addition & 1 deletion com.xored.f4.builder/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
</parent>
<groupId>com.xored.f4</groupId>
<artifactId>com.xored.f4.builder</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
6 changes: 3 additions & 3 deletions com.xored.f4.core/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: F4 Core
Bundle-SymbolicName: com.xored.f4.core;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.1.2.qualifier
Require-Bundle: org.fantom.sys,
org.fantom.concurrent,
org.eclipse.core.resources,
Expand All @@ -14,8 +14,8 @@ Require-Bundle: org.fantom.sys,
org.eclipse.dltk.launching,
org.eclipse.dltk.logconsole,
com.xored.fanide.core,
com.xored.f4.parser;bundle-version="1.1.0",
com.xored.f4.model;bundle-version="1.1.0",
com.xored.f4.parser;bundle-version="1.1.2",
com.xored.f4.model;bundle-version="1.1.2",
org.eclipse.text,
org.eclipse.pde.core
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Expand Down
Binary file modified com.xored.f4.core/f4core.pod
View file
Binary file not shown.
4 changes: 3 additions & 1 deletion com.xored.f4.core/fan/manifest/ProjectPrefs.fan
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ class ProjectPrefs {
}

Type compileEnvType() {
name := delegate.getString(qualifier, compileEnvName)
// when using the Fantom Project Wizard, the compileEnvType can be an empty string
// I suspect it is asked for, before the preferences have been initialised
name := delegate.getString(qualifier, compileEnvName)?.trimToNull ?: DefaultCompileEnv#.qname
type := Type.find(name)
return type
}
Expand Down
2 changes: 1 addition & 1 deletion com.xored.f4.core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
</parent>
<groupId>com.xored.f4</groupId>
<artifactId>com.xored.f4.core</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
14 changes: 7 additions & 7 deletions com.xored.f4.debug.ui/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: F4 Debug UI
Bundle-SymbolicName: com.xored.f4.debug.ui;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.1.2.qualifier
Bundle-Vendor: Xored software, Inc.
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Expand All @@ -24,16 +24,16 @@ Require-Bundle: org.eclipse.debug.core,
org.eclipse.jdt.debug,
com.ibm.icu,
org.eclipse.ui.ide,
com.xored.f4.core;bundle-version="1.1.0",
com.xored.f4.debug;bundle-version="1.1.0",
com.xored.f4.launching;bundle-version="1.1.0",
com.xored.f4.parser;bundle-version="1.1.0",
com.xored.f4.core;bundle-version="1.1.2",
com.xored.f4.debug;bundle-version="1.1.2",
com.xored.f4.launching;bundle-version="1.1.2",
com.xored.f4.parser;bundle-version="1.1.2",
org.eclipse.dltk.debug,
org.eclipse.jdt.debug.ui,
org.eclipse.core.filesystem,
org.eclipse.core.variables,
com.xored.fanide.core;bundle-version="1.1.0",
com.xored.f4.model;bundle-version="1.1.0",
com.xored.fanide.core;bundle-version="1.1.2",
com.xored.f4.model;bundle-version="1.1.2",
org.eclipse.jdt.core,
org.eclipse.jdt.ui,
org.eclipse.core.filebuffers
Expand Down
2 changes: 1 addition & 1 deletion com.xored.f4.debug.ui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
</parent>
<groupId>com.xored.f4</groupId>
<artifactId>com.xored.f4.debug.ui</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
4 changes: 2 additions & 2 deletions com.xored.f4.debug/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: F4 Debug
Bundle-SymbolicName: com.xored.f4.debug;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.1.2.qualifier
Bundle-Vendor: Xored software, Inc.
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.debug.core,
org.eclipse.core.runtime,
com.xored.fanide.core,
org.fantom.sys,
org.eclipse.dltk.debug,
com.xored.f4.core;bundle-version="1.1.0"
com.xored.f4.core;bundle-version="1.1.2"
2 changes: 1 addition & 1 deletion com.xored.f4.debug/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
</parent>
<groupId>com.xored.f4</groupId>
<artifactId>com.xored.f4.debug</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
8 changes: 4 additions & 4 deletions com.xored.f4.fcode.ui/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: F4 Fcode UI
Bundle-SymbolicName: com.xored.f4.fcode.ui;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.1.2.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.fantom.sys,
org.fantom.compiler,
org.eclipse.ui,
org.eclipse.dltk.ui,
org.eclipse.ui.ide,
com.xored.fanide.core;bundle-version="1.1.0",
com.xored.fanide.core;bundle-version="1.1.2",
org.eclipse.dltk.core,
org.eclipse.jface.text,
com.xored.fanide.ui;bundle-version="1.1.0",
com.xored.f4.fcode;bundle-version="1.1.0",
com.xored.fanide.ui;bundle-version="1.1.2",
com.xored.f4.fcode;bundle-version="1.1.2",
org.eclipse.core.filebuffers
Bundle-Vendor: Xored software, Inc.
Bundle-RequiredExecutionEnvironment: J2SE-1.5
2 changes: 1 addition & 1 deletion com.xored.f4.fcode.ui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
</parent>
<groupId>com.xored.f4</groupId>
<artifactId>com.xored.f4.fcode.ui</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
8 changes: 4 additions & 4 deletions com.xored.f4.fcode/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: F4 Fcode
Bundle-SymbolicName: com.xored.f4.fcode;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.1.2.qualifier
Bundle-Vendor: Xored software, Inc.
Require-Bundle: org.eclipse.dltk.core,
com.xored.fanide.core;bundle-version="1.1.0",
com.xored.fanide.core;bundle-version="1.1.2",
org.fantom.sys,
org.fantom.compiler,
com.xored.f4.core;bundle-version="1.1.0",
com.xored.f4.parser;bundle-version="1.1.0",
com.xored.f4.core;bundle-version="1.1.2",
com.xored.f4.parser;bundle-version="1.1.2",
org.eclipse.core.runtime,
org.eclipse.core.resources
Bundle-RequiredExecutionEnvironment: J2SE-1.5
2 changes: 1 addition & 1 deletion com.xored.f4.fcode/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
</parent>
<groupId>com.xored.f4</groupId>
<artifactId>com.xored.f4.fcode</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
2 changes: 1 addition & 1 deletion com.xored.f4.feature/feature.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#-------------------------------------------------------------------------------
copyrightURL=epl-v10.html
copyright=\
Copyright (c) 2008, 2016 xored software, Inc.\n\
Copyright (c) 2008, 2019 xored software, Inc.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
Expand Down
2 changes: 1 addition & 1 deletion com.xored.f4.feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.xored.f4.feature"
label="F4 Fantom IDE"
version="1.1.0.qualifier"
version="1.1.2.qualifier"
provider-name="Xored software, Inc."
plugin="com.xored.f4.platform">

Expand Down
2 changes: 1 addition & 1 deletion com.xored.f4.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
</parent>
<groupId>com.xored.f4</groupId>
<artifactId>com.xored.f4.feature</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
10 changes: 5 additions & 5 deletions com.xored.f4.jdt.launching.ui/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: F4 JDT Launching UI
Bundle-SymbolicName: com.xored.f4.jdt.launching.ui;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.1.2.qualifier
Bundle-Vendor: Xored software, Inc.
Require-Bundle: org.fantom.sys,
org.eclipse.debug.ui,
Expand All @@ -14,13 +14,13 @@ Require-Bundle: org.fantom.sys,
org.eclipse.swt,
org.eclipse.core.runtime,
org.fantom.fwt,
com.xored.f4.jdt.launching;bundle-version="1.1.0",
com.xored.f4.launching;bundle-version="1.1.0",
com.xored.f4.model;bundle-version="1.1.0",
com.xored.f4.jdt.launching;bundle-version="1.1.2",
com.xored.f4.launching;bundle-version="1.1.2",
com.xored.f4.model;bundle-version="1.1.2",
org.eclipse.jdt.launching,
org.eclipse.jdt.debug,
org.eclipse.dltk.core,
com.xored.fanide.core;bundle-version="1.1.0",
com.xored.fanide.core;bundle-version="1.1.2",
org.eclipse.jface.text,
org.eclipse.core.filebuffers,
org.eclipse.core.filesystem,
Expand Down
2 changes: 1 addition & 1 deletion com.xored.f4.jdt.launching.ui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
</parent>
<groupId>com.xored.f4</groupId>
<artifactId>com.xored.f4.jdt.launching.ui</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
2 changes: 1 addition & 1 deletion com.xored.f4.jdt.launching/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: F4 JDT Launching
Bundle-SymbolicName: com.xored.f4.jdt.launching;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.1.2.qualifier
Bundle-Vendor: Xored software, Inc.
Require-Bundle: org.fantom.sys,
org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion com.xored.f4.jdt.launching/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
</parent>
<groupId>com.xored.f4</groupId>
<artifactId>com.xored.f4.jdt.launching</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
2 changes: 1 addition & 1 deletion com.xored.f4.launchEnv/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: F4 LaunchEnv
Bundle-SymbolicName: com.xored.f4.launchEnv;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.1.2.qualifier
Require-Bundle: org.fantom.sys;bundle-version="1.0.71"
2 changes: 1 addition & 1 deletion com.xored.f4.launchEnv/build.fan
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class Build : BuildPod {
new make() {
podName = "f4launchEnv"
summary = "A Fantom Env for projects launched by F4"
version = Version("1.1.0")
version = Version("1.1.2")

meta = [
"proj.name" : "F4 Launch Environment"
Expand Down
Binary file modified com.xored.f4.launchEnv/f4launchEnv.pod
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion com.xored.f4.launchEnv/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
</parent>
<groupId>com.xored.f4</groupId>
<artifactId>com.xored.f4.launchEnv</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
8 changes: 4 additions & 4 deletions com.xored.f4.launching/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: F4 Launching
Bundle-SymbolicName: com.xored.f4.launching;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.1.2.qualifier
Bundle-Vendor: xored software, Inc.
Require-Bundle: org.fantom.sys,
org.eclipse.core.runtime,
org.eclipse.dltk.launching,
org.eclipse.dltk.core,
com.xored.fanide.core;bundle-version="1.1.0",
com.xored.fanide.core;bundle-version="1.1.2",
org.eclipse.debug.core,
org.eclipse.dltk.debug,
org.eclipse.core.variables,
org.eclipse.emf.ecore.xmi,
org.fantom.compiler,
com.xored.f4.core;bundle-version="1.1.0",
com.xored.f4.fcode;bundle-version="1.1.0"
com.xored.f4.core;bundle-version="1.1.2",
com.xored.f4.fcode;bundle-version="1.1.2"
2 changes: 1 addition & 1 deletion com.xored.f4.launching/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
</parent>
<groupId>com.xored.f4</groupId>
<artifactId>com.xored.f4.launching</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
2 changes: 1 addition & 1 deletion com.xored.f4.model/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: F4 Model
Bundle-SymbolicName: com.xored.f4.model;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.1.2.qualifier
Bundle-Vendor: xored software, Inc.
Require-Bundle: org.fantom.sys,
org.fantom.compiler,
Expand Down
2 changes: 1 addition & 1 deletion com.xored.f4.model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
</parent>
<groupId>com.xored.f4</groupId>
<artifactId>com.xored.f4.model</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
4 changes: 2 additions & 2 deletions com.xored.f4.parser/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: F4 Parser
Bundle-SymbolicName: com.xored.f4.parser;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.1.2.qualifier
Require-Bundle: org.fantom.sys,
com.xored.f4.model;bundle-version="1.1.0"
com.xored.f4.model;bundle-version="1.1.2"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
2 changes: 1 addition & 1 deletion com.xored.f4.parser/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
</parent>
<groupId>com.xored.f4</groupId>
<artifactId>com.xored.f4.parser</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Loading

0 comments on commit b4aba9f

Please sign in to comment.