diff options
| author | Alexey Ushakov <Alexey.Ushakov@jetbrains.com> | 2016-11-25 12:23:16 +0300 |
|---|---|---|
| committer | Alexey Ushakov <Alexey.Ushakov@jetbrains.com> | 2016-11-25 12:23:16 +0300 |
| commit | 5ff17cb393b23102d99567dcfd3bce2b7343760f (patch) | |
| tree | 1a7d0740121def5a6fc16809a6fffb62961c9978 | |
| parent | 42fb6114389249c493899915d821105a84d38552 (diff) | |
| download | jdk8u-jb8u112-b621.tar.gz | |
JRE-118 Emoji supportjb8u112-b641jb8u112-b640jb8u112-b639jb8u112-b638jb8u112-b637jb8u112-b636jb8u112-b634jb8u112-b629jb8u112-b628jb8u112-b626jb8u112-b625jb8u112-b623jb8u112-b622jb8u112-b621jb8u112-b620jb8u112-b619jb8u112-b618jb8u112-b616jb8u112-b615jb8u112-b614jb8u112-b613jb8u112-b607jb8u112-b606jb8u112-b605jb8u112-b604jb8u112-b594jb8u112-b585jb8u112-b584jb8u112-b583jb8u112-b582jb8u112-b581jb8u112-b580jb8u112-b579
addfix for linking on Windows
| -rw-r--r-- | idea/java/.idea/gradle.xml | 5 | ||||
| -rw-r--r-- | idea/java/.idea/modules.xml | 2 | ||||
| -rw-r--r-- | idea/java/.idea/modules/java.iml | 32 |
3 files changed, 5 insertions, 34 deletions
diff --git a/idea/java/.idea/gradle.xml b/idea/java/.idea/gradle.xml index 5f767b9..a5c3ae1 100644 --- a/idea/java/.idea/gradle.xml +++ b/idea/java/.idea/gradle.xml @@ -3,15 +3,14 @@ <component name="GradleSettings"> <option name="linkedExternalProjectsSettings"> <GradleProjectSettings> - <option name="distributionType" value="WRAPPED" /> + <option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="externalProjectPath" value="$PROJECT_DIR$" /> - <option name="gradleJvm" value="JBSDK" /> + <option name="gradleJvm" value="1.8" /> <option name="modules"> <set> <option value="$PROJECT_DIR$" /> </set> </option> - <option name="resolveModulePerSourceSet" value="false" /> </GradleProjectSettings> </option> </component> diff --git a/idea/java/.idea/modules.xml b/idea/java/.idea/modules.xml index ba5592c..2808ed4 100644 --- a/idea/java/.idea/modules.xml +++ b/idea/java/.idea/modules.xml @@ -3,6 +3,8 @@ <component name="ProjectModuleManager"> <modules> <module fileurl="file://$PROJECT_DIR$/.idea/modules/java.iml" filepath="$PROJECT_DIR$/.idea/modules/java.iml" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/java_main.iml" filepath="$PROJECT_DIR$/.idea/modules/java_main.iml" group="java" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/java_test.iml" filepath="$PROJECT_DIR$/.idea/modules/java_test.iml" group="java" /> </modules> </component> </project>
\ No newline at end of file diff --git a/idea/java/.idea/modules/java.iml b/idea/java/.idea/modules/java.iml index fb4ab9c..39a2a59 100644 --- a/idea/java/.idea/modules/java.iml +++ b/idea/java/.idea/modules/java.iml @@ -1,42 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <module external.linked.project.id="java" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager"> - <output url="file://$MODULE_DIR$/../../build/classes/main" /> - <output-test url="file://$MODULE_DIR$/../../build/classes/test" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$/../.."> - <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" /> <excludeFolder url="file://$MODULE_DIR$/../../.gradle" /> <excludeFolder url="file://$MODULE_DIR$/../../build" /> </content> - <content url="file://$MODULE_DIR$/../../../../jdk/idea"> - <sourceFolder url="file://$MODULE_DIR$/../../../../jdk/idea/java/tests/src" isTestSource="false" /> - </content> - <content url="file://$MODULE_DIR$/../../../../jdk/src/macosx"> - <sourceFolder url="file://$MODULE_DIR$/../../../../jdk/src/macosx/classes" isTestSource="false" /> - </content> - <content url="file://$MODULE_DIR$/../../../../jdk/src/share"> - <sourceFolder url="file://$MODULE_DIR$/../../../../jdk/src/share/classes" isTestSource="false" /> - </content> - <content url="file://$MODULE_DIR$/../../../../jdk/src/solaris"> - <sourceFolder url="file://$MODULE_DIR$/../../../../jdk/src/solaris/classes" isTestSource="false" /> - </content> - <content url="file://$MODULE_DIR$/../../../../jdk/src/windows"> - <sourceFolder url="file://$MODULE_DIR$/../../../../jdk/src/windows/classes" isTestSource="false" /> - </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module-library"> - <library name="JUnit4"> - <CLASSES> - <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.12.jar!/" /> - <root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-core-1.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> </component> </module>
\ No newline at end of file |