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

Fix maven build: rename namespace class to package class

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2013-01-18 12:07:01 +04:00
parent fb9c4b92c4
commit 5c56900a09
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/docs/website/pom.xml
+1 -1
View File
@@ -67,7 +67,7 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<mainClass>org.jetbrains.kotlin.site.namespace</mainClass> <mainClass>org.jetbrains.kotlin.site.SitePackage</mainClass>
<arguments> <arguments>
<argument>${basedir}</argument> <argument>${basedir}</argument>
</arguments> </arguments>
libraries/examples/browser-example/pom.xml
+1 -1
View File
@@ -106,7 +106,7 @@
<phase>test</phase> <phase>test</phase>
<configuration> <configuration>
<target> <target>
<java fork="true" classpathref="maven.test.classpath" classname="io.kool.javafx.namespace"> <java fork="true" classpathref="maven.test.classpath" classname="io.kool.javafx.JavafxPackage">
<arg value="file://sample-javafx.html"/> <arg value="file://sample-javafx.html"/>
</java> </java>
</target> </target>
libraries/examples/browser-example/sample-javafx.html
+1 -1
View File
@@ -9,7 +9,7 @@
</div> </div>
<script type="text/kotlin"> <script type="text/kotlin">
sample.namespace.myApp() sample.SamplePackage.myApp()
</script> </script>
</body> </body>
libraries/examples/kotlin-java-example/src/test/java/test/kotlin/jtests/CollectionTest.java
+2 -2
View File
@@ -1,7 +1,7 @@
package test.kotlin.jtests; package test.kotlin.jtests;
import static kotlin.namespace.*; import static kotlin.KotlinPackage.*;
import static kotlin.util.namespace.*; import static kotlin.util.UtilPackage.*;
import jet.Function1; import jet.Function1;
import junit.framework.TestCase; import junit.framework.TestCase;
libraries/kotlin-swing/pom.xml
+2 -2
View File
@@ -63,7 +63,7 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<mainClass>demo.namespace</mainClass> <mainClass>demo.DemoPackage</mainClass>
<classpathScope>test</classpathScope> <classpathScope>test</classpathScope>
<systemProperties> <systemProperties>
<systemProperty> <systemProperty>
@@ -98,7 +98,7 @@
<phase>test</phase> <phase>test</phase>
<configuration> <configuration>
<target> <target>
<java fork="true" classpathref="maven.test.classpath" classname="demo.namespace"/> <java fork="true" classpathref="maven.test.classpath" classname="demo.DemoPackage"/>
</target> </target>
</configuration> </configuration>
<goals> <goals>
libraries/stdlib/pom.xml
+1 -1
View File
@@ -38,7 +38,7 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<mainClass>org.jetbrains.kotlin.tools.namespace</mainClass> <mainClass>org.jetbrains.kotlin.tools.ToolsPackage</mainClass>
<classpathScope>test</classpathScope> <classpathScope>test</classpathScope>
</configuration> </configuration>
</plugin> </plugin>
libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
+2 -2
View File
@@ -171,7 +171,7 @@ abstract class KClassOrPackage(model: KModel, declarationDescriptor: Declaration
class SourceInfo(val psi: JetFile, val relativePath: String, val htmlPath: String) class SourceInfo(val psi: JetFile, val relativePath: String, val htmlPath: String)
class KModel(val context: BindingContext, val config: KDocConfig, val sourceDirs: List<File>, val sources: List<JetFile>) { class KModel(val context: BindingContext, val config: KDocConfig, val sourceDirs: List<File>, val sources: List<JetFile>) {
// TODO generates java.lang.NoSuchMethodError: kotlin.util.namespace.hashMap(Ljet/TypeInfo;Ljet/TypeInfo;)Ljava/util/HashMap; // TODO generates java.lang.NoSuchMethodError: kotlin.util.UtilPackage.hashMap(Ljet/TypeInfo;Ljet/TypeInfo;)Ljava/util/HashMap;
//val packages = sortedMap<String,KPackage>() //val packages = sortedMap<String,KPackage>()
public val packageMap: SortedMap<String, KPackage> = TreeMap<String, KPackage>() public val packageMap: SortedMap<String, KPackage> = TreeMap<String, KPackage>()
@@ -942,7 +942,7 @@ class KPackage(model: KModel, val descriptor: NamespaceDescriptor,
var useExternalLink: Boolean = false): KClassOrPackage(model, descriptor), Comparable<KPackage> { var useExternalLink: Boolean = false): KClassOrPackage(model, descriptor), Comparable<KPackage> {
// TODO generates java.lang.NoSuchMethodError: kotlin.util.namespace.hashMap(Ljet/TypeInfo;Ljet/TypeInfo;)Ljava/util/HashMap; // TODO generates java.lang.NoSuchMethodError: kotlin.util.UtilPackage.hashMap(Ljet/TypeInfo;Ljet/TypeInfo;)Ljava/util/HashMap;
//val classes = sortedMap<String,KClass>() //val classes = sortedMap<String,KClass>()
public val classMap: SortedMap<String, KClass> = TreeMap<String, KClass>() public val classMap: SortedMap<String, KClass> = TreeMap<String, KClass>()