azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some more minor fixes after review

Browse Source 
(cherry picked from commit 1ffdeff)
This commit is contained in:
ligee
2015-07-30 10:39:48 +02:00
parent c2c1fb2d0a
commit 97bc3005f4
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/misc.xml
Generated
+1 -1
View File
@@ -54,7 +54,7 @@
<component name="ProjectResources"> <component name="ProjectResources">
<default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype> <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
<component name="WebServicesPlugin" addRequiredLibraries="true" /> <component name="WebServicesPlugin" addRequiredLibraries="true" />
libraries/tools/kotlin-compiler-embeddable/pom.xml
+11 -10
View File
@@ -7,6 +7,7 @@
<properties> <properties>
<maven-plugin-anno.version>1.4.1</maven-plugin-anno.version> <maven-plugin-anno.version>1.4.1</maven-plugin-anno.version>
<maven.version>3.0.4</maven.version> <maven.version>3.0.4</maven.version>
<kotlin.relocated.package>org.jetbrains.kotlin.relocated</kotlin.relocated.package>
</properties> </properties>
<parent> <parent>
@@ -103,7 +104,7 @@
<createDependencyReducedPom>true</createDependencyReducedPom> <createDependencyReducedPom>true</createDependencyReducedPom>
<filters> <filters>
<filter> <filter>
<artifact>*:kotlin-runtlime</artifact> <artifact>*:kotlin-runtime</artifact>
<excludes> <excludes>
<exclude>META-INF/**</exclude> <exclude>META-INF/**</exclude>
</excludes> </excludes>
@@ -120,39 +121,39 @@
<relocations> <relocations>
<relocation> <relocation>
<pattern>com.google</pattern> <pattern>com.google</pattern>
<shadedPattern>org.jetbrains.kotlin.relocated.com.google</shadedPattern> <shadedPattern>${kotlin.relocated.package}.com.google</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.sampullara</pattern> <pattern>com.sampullara</pattern>
<shadedPattern>org.jetbrains.kotlin.relocated.com.sampullara</shadedPattern> <shadedPattern>${kotlin.relocated.package}.com.sampullara</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache</pattern> <pattern>org.apache</pattern>
<shadedPattern>org.jetbrains.kotlin.relocated.org.apache</shadedPattern> <shadedPattern>${kotlin.relocated.package}.org.apache</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.jdom</pattern> <pattern>org.jdom</pattern>
<shadedPattern>org.jetbrains.kotlin.relocated.org.jdom</shadedPattern> <shadedPattern>${kotlin.relocated.package}.org.jdom</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.fusesource</pattern> <pattern>org.fusesource</pattern>
<shadedPattern>org.jetbrains.kotlin.relocated.org.fusesource</shadedPattern> <shadedPattern>${kotlin.relocated.package}.org.fusesource</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.picocontainer</pattern> <pattern>org.picocontainer</pattern>
<shadedPattern>org.jetbrains.kotlin.relocated.org.picocontainer</shadedPattern> <shadedPattern>${kotlin.relocated.package}.org.picocontainer</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>jline</pattern> <pattern>jline</pattern>
<shadedPattern>org.jetbrains.kotlin.relocated.jline</shadedPattern> <shadedPattern>${kotlin.relocated.package}.jline</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>gnu</pattern> <pattern>gnu</pattern>
<shadedPattern>org.jetbrains.kotlin.relocated.gnu</shadedPattern> <shadedPattern>${kotlin.relocated.package}.gnu</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>javax.inject</pattern> <pattern>javax.inject</pattern>
<shadedPattern>org.jetbrains.kotlin.relocated.javax.inject</shadedPattern> <shadedPattern>${kotlin.relocated.package}.javax.inject</shadedPattern>
</relocation> </relocation>
</relocations> </relocations>
</configuration> </configuration>