From 75637566729dd00d7960735b362f3adba94318a3 Mon Sep 17 00:00:00 2001 From: Carlos Ballesteros Velasco Date: Sat, 20 May 2017 00:02:44 +0200 Subject: [PATCH] Updated to 0.6.0 --- ChangeLog.md | 6 ++++-- README.md | 2 +- benchmark/gradle.properties | 2 +- gradle.properties | 2 +- jtransc-main-run/example-gradle/gradle.properties | 2 +- jtransc-main-run/pom.xml | 2 +- jtransc-main/test/big/BigTest.kt | 2 +- jtransc-maven-plugin/example/pom.xml | 4 ++-- .../jtransc-maven-plugin/plugin-help.xml | 2 +- .../jtransc-maven-plugin/pom.properties | 2 +- .../maven/com.jtransc/jtransc-maven-plugin/pom.xml | 2 +- .../resources/META-INF/maven/plugin.xml | 14 +++++++------- .../src/com/jtransc/JTranscVersion.java | 2 +- jtransc-rt/resources/cpp/CMakeLists.txt | 4 ++++ 14 files changed, 27 insertions(+), 21 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 35a21c86..b30bc348 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,13 +1,14 @@ # CHANGELOG -## 0.6.0 (WIP) +## 0.6.0 ### New features -- @Intrigus: C++ target with GC +- @Intrigus: C++ target with GC continuing the work on @dsp-omen that created the initial c++ target - AS3 target (BigTest passes) - Dart target (BigTest passes) - Prevent generating runtime invisible annotations - Added com.jtransc.io.async package to handle asynchronous I/O +- Improved com.jtransc.js.JsDynamic ### Changes - Some refactorings at CommonGenerator @@ -16,6 +17,7 @@ ### Fixes - @SergeyLabutin - Static initialization fixes - @SergeyLabutin - Some thread work on Haxe/CPP +- Handle template references inside `@JTranscCallSiteBody` ### Implemented features - @SergeyLabutin - Implemented Class.getGenericSuperclass diff --git a/README.md b/README.md index 6d3b682b..21f852e1 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ This is the preferred way of using JTransc. You can include it from maven centra ``` plugins { - id "com.jtransc" version "0.5.16" + id "com.jtransc" version "0.6.0" } ``` diff --git a/benchmark/gradle.properties b/benchmark/gradle.properties index ccf95a63..5e487948 100644 --- a/benchmark/gradle.properties +++ b/benchmark/gradle.properties @@ -1 +1 @@ -jtranscVersion=0.5.16 +jtranscVersion=0.6.0 diff --git a/gradle.properties b/gradle.properties index 9e06216b..4bbe8bab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -jtranscVersion=0.5.16 +jtranscVersion=0.6.0 kotlinVersion=1.1.2-3 file.encoding=UTF-8 kotlin.incremental=true diff --git a/jtransc-main-run/example-gradle/gradle.properties b/jtransc-main-run/example-gradle/gradle.properties index ccf95a63..5e487948 100644 --- a/jtransc-main-run/example-gradle/gradle.properties +++ b/jtransc-main-run/example-gradle/gradle.properties @@ -1 +1 @@ -jtranscVersion=0.5.16 +jtranscVersion=0.6.0 diff --git a/jtransc-main-run/pom.xml b/jtransc-main-run/pom.xml index da048a56..f97fdf85 100644 --- a/jtransc-main-run/pom.xml +++ b/jtransc-main-run/pom.xml @@ -22,7 +22,7 @@ 4.0.0 com.jtransc - 0.5.16 + 0.6.0 jtransc-main-run diff --git a/jtransc-main/test/big/BigTest.kt b/jtransc-main/test/big/BigTest.kt index 593c2ac6..8cd0bce6 100644 --- a/jtransc-main/test/big/BigTest.kt +++ b/jtransc-main/test/big/BigTest.kt @@ -95,7 +95,7 @@ object BigTest { // Java8 tests //JTranscClinitNotStatic.main(args) //DefaultMethodsTest.main(args) - //Java8Test.main(args) + Java8Test.main(args) // Misc Base64Test.main(args); diff --git a/jtransc-maven-plugin/example/pom.xml b/jtransc-maven-plugin/example/pom.xml index 59bfacad..79dba2db 100644 --- a/jtransc-maven-plugin/example/pom.xml +++ b/jtransc-maven-plugin/example/pom.xml @@ -43,7 +43,7 @@ com.jtransc jtransc-rt-core - 0.5.16 + 0.6.0 @@ -53,7 +53,7 @@ com.jtransc jtransc-maven-plugin - 0.5.16 + 0.6.0 js:js:program.js example.Test diff --git a/jtransc-maven-plugin/resources/META-INF/maven/com.jtransc/jtransc-maven-plugin/plugin-help.xml b/jtransc-maven-plugin/resources/META-INF/maven/com.jtransc/jtransc-maven-plugin/plugin-help.xml index 1a5189aa..133ad4fb 100644 --- a/jtransc-maven-plugin/resources/META-INF/maven/com.jtransc/jtransc-maven-plugin/plugin-help.xml +++ b/jtransc-maven-plugin/resources/META-INF/maven/com.jtransc/jtransc-maven-plugin/plugin-help.xml @@ -7,7 +7,7 @@ Maven plugin for JVM AOT compiler currently generating Haxe, with initial focus on kotlin and games. com.jtransc jtransc-maven-plugin - 0.5.16 + 0.6.0 jtransc diff --git a/jtransc-maven-plugin/resources/META-INF/maven/com.jtransc/jtransc-maven-plugin/pom.properties b/jtransc-maven-plugin/resources/META-INF/maven/com.jtransc/jtransc-maven-plugin/pom.properties index 32b2a3b2..32a41e34 100644 --- a/jtransc-maven-plugin/resources/META-INF/maven/com.jtransc/jtransc-maven-plugin/pom.properties +++ b/jtransc-maven-plugin/resources/META-INF/maven/com.jtransc/jtransc-maven-plugin/pom.properties @@ -1,5 +1,5 @@ #Generated by Apache Maven #Thu May 26 02:15:01 CEST 2016 -version=0.5.16 +version=0.6.0 groupId=com.jtransc artifactId=jtransc-maven-plugin diff --git a/jtransc-maven-plugin/resources/META-INF/maven/com.jtransc/jtransc-maven-plugin/pom.xml b/jtransc-maven-plugin/resources/META-INF/maven/com.jtransc/jtransc-maven-plugin/pom.xml index c3d95e9d..5cb2386e 100644 --- a/jtransc-maven-plugin/resources/META-INF/maven/com.jtransc/jtransc-maven-plugin/pom.xml +++ b/jtransc-maven-plugin/resources/META-INF/maven/com.jtransc/jtransc-maven-plugin/pom.xml @@ -20,7 +20,7 @@ com.jtransc jtransc - 0.5.16 + 0.6.0 ../pom.xml diff --git a/jtransc-maven-plugin/resources/META-INF/maven/plugin.xml b/jtransc-maven-plugin/resources/META-INF/maven/plugin.xml index 487b01a8..c30c98b6 100644 --- a/jtransc-maven-plugin/resources/META-INF/maven/plugin.xml +++ b/jtransc-maven-plugin/resources/META-INF/maven/plugin.xml @@ -7,7 +7,7 @@ Maven plugin for JVM AOT compiler currently generating Haxe, with initial focus on kotlin and games. com.jtransc jtransc-maven-plugin - 0.5.16 + 0.6.0 jtransc false true @@ -296,37 +296,37 @@ com.jtransc jtransc-core jar - 0.5.16 + 0.6.0 com.jtransc jtransc-utils jar - 0.5.16 + 0.6.0 com.jtransc jtransc-asm jar - 0.5.16 + 0.6.0 com.jtransc jtransc-rt-core jar - 0.5.16 + 0.6.0 com.jtransc jtransc-main jar - 0.5.16 + 0.6.0 com.jtransc jtransc-gen-haxe jar - 0.5.16 + 0.6.0 org.ow2.asm diff --git a/jtransc-rt-core/src/com/jtransc/JTranscVersion.java b/jtransc-rt-core/src/com/jtransc/JTranscVersion.java index e26f2ff2..1a588148 100644 --- a/jtransc-rt-core/src/com/jtransc/JTranscVersion.java +++ b/jtransc-rt-core/src/com/jtransc/JTranscVersion.java @@ -1,7 +1,7 @@ package com.jtransc; public class JTranscVersion { - static private final String version = "0.5.16"; + static private final String version = "0.6.0"; static public String getVersion() { return version; diff --git a/jtransc-rt/resources/cpp/CMakeLists.txt b/jtransc-rt/resources/cpp/CMakeLists.txt index 0d28b71b..c86df71b 100644 --- a/jtransc-rt/resources/cpp/CMakeLists.txt +++ b/jtransc-rt/resources/cpp/CMakeLists.txt @@ -11,4 +11,8 @@ add_definitions(-DGC_NOT_DLL=1) add_executable(program program.cpp) +#add_compile_options(-std=c++11) + +set (CMAKE_CXX_STANDARD 11) + target_link_libraries(program gc-lib)