diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdac228b1..90caecde2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,25 @@
#Changelog
- Warning: The 14.1 version of this plugin will NOT work correctly using IDEA version 14.1.2.
- It works well with versions 14.1, 14.1.1, 14.1.3, and 14.1.4. The version 14.1.5 version
- of the plugin is for IDEA versions 14.1.5 and 14.1.6.
+ Warning for IDEA v14.1.x users: The 14.1 version of this plugin will NOT
+ work correctly using IDEA version 14.1.2. It works well with versions
+ 14.1, 14.1.1, 14.1.3, and 14.1.4. The version 14.1.5 version of the
+ plugin is for IDEA versions 14.1.5, 14.1.6, and 14.1.7.
+
+ 0.10.1: (community release)
+
+ - Stop using the classpath to auto-add external libraries to projects. (issues #477 #100)
+ - Fix re-ordering imports in certain situations. (issue #494)
+ - Fix 'never' setter. (issue #486)
+ - Change class paths for external libraries on OSX.
+ - Fixed creating classes in TEST source roots
+ - Fixed debug Flash on Haxe-compiler target
+ - Fixed crash on MACRO_CLASS_LIST assert
+ - IDEA 2016 support
+ - @:deprecated support (issue #459, #473)
+ - Alias imports support (issue #466)
+ - Imports optimization: reordering added (issue #471)
+
0.9.10: (community release)
- Better packages resolving
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 487fec51d..358ca0cf1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -94,16 +94,16 @@ particularly if you see ClassNotFound exceptions when attempting to run the plug
Contributors are expected to have and build against each of the latest
sub-release of each major and minor version of IDEA that is supported
-by the plugin team. At the time of this writing, that would be 14.0.4,
-and 14.1.1, 14.1.5 (introduced a breaking change), and 15.0.3.
+by the plugin team. At the time of this writing, that would be 14.0.5,
+and 14.1.1, 14.1.7 (introduced a breaking change), 15.0.6, and 2016.2.4.
As new versions are released this will continue to be
a moving target, as we attempt to keep up with the development community.
We do NOT expect contributors to keep up to date with EAP releases, nor does
the team support them (though the plugin may work, and will usually install).
-*According to JetBrains, IDEA releases 16 EAP and later require JDK 8. That
-build environment has not been successfully used for this plugin at this time.*
+*IDEA releases 2016 and later require JDK 8. That build environment has
+been successfully used for this plugin, targeting Java6 for builds prior to 2016.x.*
####Ant Builds
@@ -276,18 +276,19 @@ IDEA output will be seen.
OK. If you haven't changed anything, this most likely isn't an issue of code.
It's an issue of updating your project structure. Since all of the versions
of the plugin build from a single source base, the project must be set up correctly.
-We decided to make the default settings be correct for IDEA v14.1. However, to
+We decided to make the default settings be correct for IDEA v2016.x. However, to
build other versions, you can either use the ant builds (see
![Ant Builds][Ant Builds] above), or you can change
the project structure to match the environment you're trying to build.
-So, for 13.1.6, open "File->Project Structure->Module->intellij-haxe->Sources(tab)," and change this:
+*Note: This same concept applies for current versions.*
+
+So, for 13.1.6, open "File->Project Structure->Module->intellij-haxe->Sources(tab)," and change this:
to this:
-
Then try to rebuild.
Unfortunately, IDEA will not allow multiple modules (.iml files) with the same
@@ -403,7 +404,7 @@ repository.
OS: Linux(Ubuntu14.04), OSX, Windows
JVM: Sun Java 1.6 target, using Sun Java 1.8 compilers (because the Java 1.6 and 1.7
maintenance windows have closed)
- IDEA versions: 14, 14.1, 14.1.6, and 15 (release versions)
+ IDEA versions: 14, 14.1, 14.1.7, 15, 2016.2 (latest release versions for each code line)
####Who will test:
@@ -462,8 +463,8 @@ basic functionality:
- Run the project
5. Run the unit tests on all versions:
- - `IDEA_VERSION=13.1.6 make test`, etc.
- - or `ant -Dintellij.ultimate.build= -f build-test.xml`, etc.
+ - `IDEA_VERSION=2016.2.4 make test`, etc.
+ - or `ant -Dintellij.ultimate.build= -f build-test.xml`, etc.
4. Tag the commit using the agreed upon release number: `git tag -a 0.9.5 -m "Release 0.9.5"`
@@ -478,7 +479,7 @@ basic functionality:
- Submit
7. Create a Pull Request to pull all of the current changes up to the JetBrains/intellij-haxe/master
-repository. Add a shoutouts to @as3Boyan and @EBatTiVo to the pull request.
+repository. Add shoutouts to @as3Boyan and @EBatTiVo to the pull request.
8. Upload the jars to the IDEA plugin repository
[https://plugins.jetbrains.com/plugin/6873?pr=idea](https://plugins.jetbrains.com/plugin/6873?pr=idea)
@@ -493,22 +494,23 @@ Here’s how:
1. Create a new (or use an existing) branch for any work that you do. The critical thing here is not
to do your work directly on the master branch.
2. Make and test your changes.
-3. When your work is complete, merge current sources from master up to your branch, re-test locally,
+3. Create unit tests for your changes. (See the testSrc and testData directories for examples.)
+4. Update src/META-INF/plugin.xml with the change description in the top (Usually "Unreleased changes"
+section).
+5. When your work is complete, merge current sources from master up to your branch, re-test locally,
then push your branch to TiVo/intellij-haxe. Travis-ci will automatically start a build and test cycle
applying your changes against the master branch.
-4. Create a pull request, and wait for comments.
-5. If you get comments that require changes, address those and return to step 2.
-6. When you get an “OK to merge,” or "approved," message from anyone on the team: Boyan, @as3boyan;
-Eric, @EBatTiVo; Srikanth, @sganapavarapu; Yannick, @yahnick, others as they become regular
-contributors), go ahead and merge your changes to master. A clean merge requires no further testing,
+6. Create a pull request, and wait for comments.
+7. If you get comments that require changes, address those and return to step 2.
+8. When you get an “OK to merge,” or "approved," message from anyone on the team: Boyan, @as3boyan;
+Eric, @EBatTiVo; Srikanth, @sganapavarapu, (others as they become regular contributors,) go ahead
+and merge your changes to master. A clean merge requires no further testing,
as Travis-ci will do it for you. However any build break must be addressed immediately. A build
that has conflicts requires manual resolution and must be re-tested locally prior to push. For regular
team members, the original requester will be the person to merge since they are best suited to address
conflicts. Merges from occasional contributors will be merged by a team member as time and
resource becomes available.
-8. Check the Travis-ci output (https://travis-ci.org/TiVo/intellij-haxe/builds) to ensure that
+9. Check the Travis-ci output (https://travis-ci.org/TiVo/intellij-haxe/builds) to ensure that
everything built correctly.
-We’re also planning on setting up an automated “nightly” build that is posted somewhere so that
-interested people can get the latest without us constantly posting it to the JetBrains IDEA repository.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 0dccd0292..9629f38d8 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -6,17 +6,15 @@ Recent contributors
- EBatTiVo
- Elias Ku
- Eric B
- - Gabor Csomak
- - giabao
+ - GitHub
- grosmar
+ - Ilya Kuzmichev
- Ilya Kuzmichev
- Ilya Kuzmichev
- isBatak
- - sganapavarapu1
- Srikanth Ganapavarapu
- Usievaład Čorny
- - Yannick Dominguez
- - yannick
+ - Usievaład Kimajeŭ
All contributors
-----------------------------------
@@ -49,9 +47,11 @@ All contributors
- fkorotkov
- Gabor Csomak
- giabao
+- GitHub
- Gregory.Shrago
- grosmar
- Hays Clark
+- Ilya Kuzmichev
- Ilya Kuzmichev
- Ilya Kuzmichev
- impaler
@@ -73,6 +73,7 @@ All contributors
- Tim Hepner
- Todd Brannam
- Usievaład Čorny
+- Usievaład Kimajeŭ
- Vassiliy Kudryashov
- vaukalak
- vladimir.krivosheev
diff --git a/idea_v14.1.5.properties b/idea_v14.1.5.properties
index 64b52c6b8..bc085ea42 100644
--- a/idea_v14.1.5.properties
+++ b/idea_v14.1.5.properties
@@ -25,7 +25,7 @@
idea.version=14.1.5
# Human-readable versions of IDEA that this build is compatible with.
-plugin.compatibility.description=IDEA 14.1.5 and 14.1.6
+plugin.compatibility.description=IDEA 14.1.5 and later 14.1.x versions.
# ###################################################
# IDEA build IDs that are compatible with this plugin.
diff --git a/jps-plugin/src/org/jetbrains/jps/haxe/build/HaxeModuleLevelBuilder.java b/jps-plugin/src/org/jetbrains/jps/haxe/build/HaxeModuleLevelBuilder.java
index 8c6e1b464..385c7de84 100644
--- a/jps-plugin/src/org/jetbrains/jps/haxe/build/HaxeModuleLevelBuilder.java
+++ b/jps-plugin/src/org/jetbrains/jps/haxe/build/HaxeModuleLevelBuilder.java
@@ -18,14 +18,11 @@
package org.jetbrains.jps.haxe.build;
import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.plugins.haxe.HaxeCommonBundle;
import com.intellij.plugins.haxe.config.HaxeTarget;
import com.intellij.plugins.haxe.config.sdk.HaxeSdkAdditionalDataBase;
import com.intellij.plugins.haxe.module.HaxeModuleSettingsBase;
import com.intellij.plugins.haxe.util.HaxeCommonCompilerUtil;
-import com.intellij.rt.execution.testFrameworks.ProcessBuilder;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NonNls;
diff --git a/src/META-INF/plugin.xml b/src/META-INF/plugin.xml
index de7c292ac..4d05518f7 100644
--- a/src/META-INF/plugin.xml
+++ b/src/META-INF/plugin.xml
@@ -29,7 +29,7 @@
com.intellij.flex
com.intellij.modules.ultimate
- 0.10.0 for @plugin.compatibility.description@
+ 0.10.1 for @plugin.compatibility.description@
This build is compatible with @plugin.compatibility.description@
@@ -37,6 +37,10 @@
0.10.1: (community release)
+ - Stop using the classpath to auto-add external libraries to projects. (issues #477 #100)
+ - Fix re-ordering imports in certain situations. (issue #494)
+ - Fix 'never' setter. (issue #486)
+ - Change class paths for external libraries on OSX.
- Fixed creating classes in TEST source roots
- Fixed debug Flash on Haxe-compiler target
- Fixed crash on MACRO_CLASS_LIST assert