Merge pull request #15 from MetaBorgCube/release/0.6.1

Release/0.6.1
MetaBorgCube · Feb 17, 2017 · e7112c2 · e7112c2
2 parents bdcfce9 + 0b30911
commit e7112c2
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Build status](http://buildfarm.metaborg.org/job/metaborgcube/job/IceDust/job/master/badge/icon)](http://buildfarm.metaborg.org/job/metaborgcube/job/IceDust/job/master/)
+[![Build status](http://buildfarm.metaborg.org/job/metaborgcube/job/IceDust/job/develop/badge/icon)](http://buildfarm.metaborg.org/job/metaborgcube/job/IceDust/job/develop/)
 
 # IceDust
 

diff --git a/change_version.sh b/change_version.sh
@@ -1 +1 @@
-grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "0.5.0(.qualifier|-SNAPSHOT)" * | xargs sed -i "" "s/0.5.0/0.5.1/g"
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "0.5.1(.qualifier|-SNAPSHOT)" * | xargs sed -i "" "s/0.5.1/0.6.1/g"
diff --git a/change_version_to_stable.sh b/change_version_to_stable.sh
@@ -1,2 +1,2 @@
-grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "0.5.1.qualifier" * | xargs sed -i "" "s/0.5.1.qualifier/0.6.0/g"
-grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "0.5.1-SNAPSHOT" * | xargs sed -i "" "s/0.5.1-SNAPSHOT/0.6.0/g"
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "0.6.1.qualifier" * | xargs sed -i "" "s/0.6.1.qualifier/0.6.1/g"
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "0.6.1-SNAPSHOT" * | xargs sed -i "" "s/0.6.1-SNAPSHOT/0.6.1/g"
diff --git a/icedust.eclipse.feature/feature.xml b/icedust.eclipse.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="icedust.eclipse.feature"
       label="IceDust Language Editor"
-      version="0.6.0">
+      version="0.6.1">
 
    <description url="https://github.com/metaborg/icedust">
       The IceDust Language Editor
@@ -35,6 +35,6 @@ Most Spoofax/IMP code is licensed under the GNU Lesser General Public License (L
          id="icedust.eclipse"
          download-size="0"
          install-size="0"
-         version="0.6.0"/>
+         version="0.6.1"/>
 
 </feature>
diff --git a/icedust.eclipse.feature/pom.xml b/icedust.eclipse.feature/pom.xml
@@ -5,7 +5,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>icedust.eclipse.feature</artifactId>
-  <version>0.6.0</version>
+  <version>0.6.1</version>
   <packaging>eclipse-feature</packaging>
 
   <parent>

diff --git a/icedust.eclipse.updatesite/pom.xml b/icedust.eclipse.updatesite/pom.xml
@@ -5,7 +5,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>icedust.eclipse.updatesite</artifactId>
-  <version>0.6.0</version>
+  <version>0.6.1</version>
   <packaging>eclipse-update-site</packaging>
 
   <parent>

diff --git a/icedust.eclipse.updatesite/site.xml b/icedust.eclipse.updatesite/site.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/icedust.eclipse.feature_0.6.0.jar" id="icedust.eclipse.feature" version="0.6.0">
+   <feature url="features/icedust.eclipse.feature_0.6.1.jar" id="icedust.eclipse.feature" version="0.6.1">
       <category name="IceDust_Language_Editor"/>
    </feature>
    <category-def name="IceDust_Language_Editor" label="IceDust Language Editor">

diff --git a/icedust.eclipse/META-INF/MANIFEST.MF b/icedust.eclipse/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: IceDust language Eclipse plugin
 Bundle-SymbolicName: icedust.eclipse;singleton:=true
-Bundle-Version: 0.6.0
+Bundle-Version: 0.6.1
 Bundle-Vendor: metaborg.org
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.metaborg.spoofax.eclipse

diff --git a/icedust.eclipse/pom.xml b/icedust.eclipse/pom.xml
@@ -2,7 +2,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>icedust.eclipse</artifactId>
-  <version>0.6.0</version>
+  <version>0.6.1</version>
   <packaging>eclipse-plugin</packaging>
 
   <parent>

diff --git a/icedust.tests/metaborg.yaml b/icedust.tests/metaborg.yaml
@@ -1,9 +1,9 @@
-id: org.metaborg:icedust.test:0.6.0
+id: org.metaborg:icedust.test:0.6.1
 name: IceDust
 metaborgVersion: 2.1.0
 dependencies:
   compile:
-  - org.metaborg:icedust:0.6.0
+  - org.metaborg:icedust:0.6.1
   - org.metaborg:org.metaborg.meta.lang.spt:${metaborgVersion}
 build:
   useBuildSystemSpec: true
diff --git a/icedust.tests/pom.xml b/icedust.tests/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.metaborg.lang</groupId>
   <artifactId>icedust.tests</artifactId>
-  <version>0.6.0</version>
+  <version>0.6.1</version>
   <packaging>spoofax-test</packaging>
 
   <parent>
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>org.metaborg</groupId>
       <artifactId>icedust</artifactId>
-      <version>0.6.0</version>
+      <version>0.6.1</version>
       <type>spoofax-language</type>
     </dependency>
     <dependency>
@@ -39,7 +39,7 @@
         <artifactId>spoofax-maven-plugin</artifactId>
         <version>${metaborg-version}</version>
         <configuration>
-          <languageUnderTest>org.metaborg:icedust:0.6.0</languageUnderTest>
+          <languageUnderTest>org.metaborg:icedust:0.6.1</languageUnderTest>
         </configuration>
       </plugin>
     </plugins>

diff --git a/icedust/editor/Main.esv b/icedust/editor/Main.esv
@@ -23,7 +23,7 @@ language General properties
   table : target/metaborg/sdf.tbl
   start symbols: Start
 
-  //provider: target/metaborg/stratego.ctree
+//  provider: target/metaborg/stratego.ctree
   provider: target/metaborg/stratego.jar
   provider: target/metaborg/stratego-javastrat.jar
 

diff --git a/icedust/metaborg.yaml b/icedust/metaborg.yaml
@@ -1,4 +1,4 @@
-id: org.metaborg:icedust:0.6.0
+id: org.metaborg:icedust:0.6.1
 name: IceDust
 metaborgVersion: 2.1.0
 dependencies:

diff --git a/icedust/pom.xml b/icedust/pom.xml
@@ -6,7 +6,7 @@
 >
   <modelVersion>4.0.0</modelVersion>
   <artifactId>icedust</artifactId>
-  <version>0.6.0</version>
+  <version>0.6.1</version>
   <name>IceDust</name>  
   <packaging>spoofax-language</packaging>
 

diff --git a/icedust/trans/generating/java/expressions.str b/icedust/trans/generating/java/expressions.str
@@ -116,7 +116,7 @@ rules // find expression
       result := (
         bstm*|[
           ~e1stms*
-          refty x_var = Expressions.emptyCollection();
+          refty x_var = null;
           for(x_type x_loopvar : ~e1exp){
             ~e2stms*
             if(~e2exp!=null && ~e2exp)

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>icedust.build</artifactId>
-  <version>0.6.0</version>
+  <version>0.6.1</version>
   <packaging>pom</packaging>
 
   <parent>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		grep -rEl --exclude=/target/ --exclude=/src-gen/ --include=.{yaml,xml,MF} "0.5.0(.qualifier\|-SNAPSHOT)" \| xargs sed -i "" "s/0.5.0/0.5.1/g"
		grep -rEl --exclude=/target/ --exclude=/src-gen/ --include=.{yaml,xml,MF} "0.5.1(.qualifier\|-SNAPSHOT)" \| xargs sed -i "" "s/0.5.1/0.6.1/g"