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

Rename java -> jvm, jet -> kotlin in module serialization.java

Browse Source 
org.jetbrains.jet.descriptors.serialization ->
org.jetbrains.kotlin.serialization.jvm

Original commit: 00878cc31a
This commit is contained in:
Alexander Udalov
2015-01-09 14:06:45 +03:00
parent 2c26ffabfd
commit 4038efbe21
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/jps-plugin.iml
+2 -3
View File
@@ -17,10 +17,9 @@
<orderEntry type="module" module-name="backend" scope="TEST" /> <orderEntry type="module" module-name="backend" scope="TEST" />
<orderEntry type="module" module-name="descriptors" /> <orderEntry type="module" module-name="descriptors" />
<orderEntry type="module" module-name="frontend.java" /> <orderEntry type="module" module-name="frontend.java" />
<orderEntry type="module" module-name="serialization.java" /> <orderEntry type="module" module-name="serialization.jvm" />
<orderEntry type="module" module-name="serialization" /> <orderEntry type="module" module-name="serialization" />
<orderEntry type="module" module-name="compiler-tests" scope="TEST" /> <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
<orderEntry type="library" name="asm" level="project" /> <orderEntry type="library" name="asm" level="project" />
</component> </component>
</module> </module>
jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import com.intellij.util.io.IOUtil
import java.io.DataInput import java.io.DataInput
import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.lang.resolve.name.FqName
import com.intellij.util.io.DataExternalizer import com.intellij.util.io.DataExternalizer
import org.jetbrains.jet.descriptors.serialization.BitEncoding import org.jetbrains.kotlin.serialization.jvm.BitEncoding
import java.util.Arrays import java.util.Arrays
import org.jetbrains.org.objectweb.asm.* import org.jetbrains.org.objectweb.asm.*
import com.intellij.util.io.EnumeratorStringDescriptor import com.intellij.util.io.EnumeratorStringDescriptor
jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt
+3 -3
View File
@@ -28,8 +28,8 @@ import com.google.common.hash.Hashing
import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.FileUtil
import com.google.common.collect.Sets import com.google.common.collect.Sets
import java.util.HashSet import java.util.HashSet
import org.jetbrains.jet.descriptors.serialization.BitEncoding import org.jetbrains.kotlin.serialization.jvm.BitEncoding
import org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf import org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf
import com.google.protobuf.ExtensionRegistry import com.google.protobuf.ExtensionRegistry
import java.io.ByteArrayInputStream import java.io.ByteArrayInputStream
import org.jetbrains.jet.descriptors.serialization.DebugProtoBuf import org.jetbrains.jet.descriptors.serialization.DebugProtoBuf
@@ -158,7 +158,7 @@ fun classFileToString(classFile: File): String {
fun getExtensionRegistry(): ExtensionRegistry { fun getExtensionRegistry(): ExtensionRegistry {
val registry = ExtensionRegistry.newInstance()!! val registry = ExtensionRegistry.newInstance()!!
DebugJavaProtoBuf.registerAllExtensions(registry) DebugJvmProtoBuf.registerAllExtensions(registry)
return registry return registry
} }