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

Temporary hack to migrate functions to package kotlin.jvm.functions

Browse Source 
Add a file in package 'kotlin.jvm.functions' to the project and replace
explicit imports of functions 'kotlin.Function{n}' to two imports 'kotlin.*'
and 'kotlin.jvm.functions.*', so that the codebase can be compiled both by the
old and by the new compiler
This commit is contained in:
Alexander Udalov
2015-04-23 22:00:04 +03:00
parent 7baa7a72e2
commit 738a84e259
123 changed files with 299 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.builtins;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.descriptors.impl;
import kotlin.Function0;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.name.Name;
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.descriptors.impl;
import kotlin.Function0;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.ReadOnly;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java
+4 -2
View File
@@ -16,8 +16,10 @@
package org.jetbrains.kotlin.descriptors.impl;
import kotlin.Function0;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.*;
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererBuilder.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.renderer;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.name.FqName;
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.renderer;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.resolve;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.resolve;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import kotlin.Unit;
import kotlin.jvm.KotlinSignature;
core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.types;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.types;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.types;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import kotlin.Unit;
import org.jetbrains.annotations.NotNull;