default -> companion: replace all mentions of default and default object
Original commit: 06916d98c6
This commit is contained in:
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
Cleaning output files:
|
Cleaning output files:
|
||||||
out/production/module/test/Klass$Default.class
|
out/production/module/test/Klass$Companion.class
|
||||||
out/production/module/test/Klass.class
|
out/production/module/test/Klass.class
|
||||||
End of files
|
End of files
|
||||||
Compiling files:
|
Compiling files:
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package test
|
package test
|
||||||
|
|
||||||
class Klass {
|
class Klass {
|
||||||
default object {
|
companion object {
|
||||||
// Old and new constant values are different, but their hashes are the same
|
// Old and new constant values are different, but their hashes are the same
|
||||||
val CONST = "BF"
|
val CONST = "BF"
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
package test
|
package test
|
||||||
|
|
||||||
class Klass {
|
class Klass {
|
||||||
default object {
|
companion object {
|
||||||
// Old and new constant values are different, but their hashes are the same
|
// Old and new constant values are different, but their hashes are the same
|
||||||
val CONST = "Ae"
|
val CONST = "Ae"
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
Cleaning output files:
|
Cleaning output files:
|
||||||
out/production/module/test/Klass$Default.class
|
out/production/module/test/Klass$Companion.class
|
||||||
out/production/module/test/Klass.class
|
out/production/module/test/Klass.class
|
||||||
End of files
|
End of files
|
||||||
Compiling files:
|
Compiling files:
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
package test
|
package test
|
||||||
|
|
||||||
class Klass {
|
class Klass {
|
||||||
default object {
|
companion object {
|
||||||
val CONST = "bar"
|
val CONST = "bar"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
package test
|
package test
|
||||||
|
|
||||||
class Klass {
|
class Klass {
|
||||||
default object {
|
companion object {
|
||||||
val CONST = "bar"
|
val CONST = "bar"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
Cleaning output files:
|
Cleaning output files:
|
||||||
out/production/module/test/Klass$Default.class
|
out/production/module/test/Klass$Companion.class
|
||||||
out/production/module/test/Klass.class
|
out/production/module/test/Klass.class
|
||||||
End of files
|
End of files
|
||||||
Compiling files:
|
Compiling files:
|
||||||
src/const.kt
|
src/const.kt
|
||||||
End of files
|
End of files
|
||||||
Cleaning output files:
|
Cleaning output files:
|
||||||
out/production/module/test/Klass$Default.class
|
out/production/module/test/Klass$Companion.class
|
||||||
out/production/module/test/Klass.class
|
out/production/module/test/Klass.class
|
||||||
out/production/module/test/Usage.class
|
out/production/module/test/Usage.class
|
||||||
End of files
|
End of files
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package test
|
package test
|
||||||
|
|
||||||
class Klass {
|
class Klass {
|
||||||
default object {
|
companion object {
|
||||||
// Old and new constant values are different, but their hashes are the same
|
// Old and new constant values are different, but their hashes are the same
|
||||||
val CONST = "BF"
|
val CONST = "BF"
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
package test
|
package test
|
||||||
|
|
||||||
class Klass {
|
class Klass {
|
||||||
default object {
|
companion object {
|
||||||
// Old and new constant values are different, but their hashes are the same
|
// Old and new constant values are different, but their hashes are the same
|
||||||
val CONST = "Ae"
|
val CONST = "Ae"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
Cleaning output files:
|
Cleaning output files:
|
||||||
out/production/module/test/Klass$Default.class
|
out/production/module/test/Klass$Companion.class
|
||||||
out/production/module/test/Klass.class
|
out/production/module/test/Klass.class
|
||||||
out/production/module/test/TestPackage$const$*.class
|
out/production/module/test/TestPackage$const$*.class
|
||||||
out/production/module/test/TestPackage.class
|
out/production/module/test/TestPackage.class
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ package test
|
|||||||
val CONST = "foo"
|
val CONST = "foo"
|
||||||
|
|
||||||
class Klass {
|
class Klass {
|
||||||
default object {
|
companion object {
|
||||||
val CONST = "bar"
|
val CONST = "bar"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ package test
|
|||||||
val CONST = "foo"
|
val CONST = "foo"
|
||||||
|
|
||||||
class Klass {
|
class Klass {
|
||||||
default object {
|
companion object {
|
||||||
val CONST = "bar"
|
val CONST = "bar"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
Cleaning output files:
|
Cleaning output files:
|
||||||
out/production/module/test/Trait$$TImpl.class
|
out/production/module/test/Trait$$TImpl.class
|
||||||
out/production/module/test/Trait$Default.class
|
out/production/module/test/Trait$Companion.class
|
||||||
out/production/module/test/Trait.class
|
out/production/module/test/Trait.class
|
||||||
End of files
|
End of files
|
||||||
Compiling files:
|
Compiling files:
|
||||||
@@ -8,7 +8,7 @@ src/const.kt
|
|||||||
End of files
|
End of files
|
||||||
Cleaning output files:
|
Cleaning output files:
|
||||||
out/production/module/test/Trait$$TImpl.class
|
out/production/module/test/Trait$$TImpl.class
|
||||||
out/production/module/test/Trait$Default.class
|
out/production/module/test/Trait$Companion.class
|
||||||
out/production/module/test/Trait.class
|
out/production/module/test/Trait.class
|
||||||
out/production/module/test/Usage.class
|
out/production/module/test/Usage.class
|
||||||
End of files
|
End of files
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
package test
|
package test
|
||||||
|
|
||||||
trait Trait {
|
trait Trait {
|
||||||
default object {
|
companion object {
|
||||||
// Old and new constant values are different, but their hashes are the same
|
// Old and new constant values are different, but their hashes are the same
|
||||||
val CONST = "BF"
|
val CONST = "BF"
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
package test
|
package test
|
||||||
|
|
||||||
trait Trait {
|
trait Trait {
|
||||||
default object {
|
companion object {
|
||||||
// Old and new constant values are different, but their hashes are the same
|
// Old and new constant values are different, but their hashes are the same
|
||||||
val CONST = "Ae"
|
val CONST = "Ae"
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -18,6 +18,6 @@ src/usageWithFunctionLiteral.kt
|
|||||||
End of files
|
End of files
|
||||||
COMPILATION FAILED
|
COMPILATION FAILED
|
||||||
Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found
|
Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found
|
||||||
Please specify constructor invocation; classifier 'SamInterface' does not have a default object
|
Please specify constructor invocation; classifier 'SamInterface' does not have a companion object
|
||||||
Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found
|
Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found
|
||||||
Please specify constructor invocation; classifier 'SamInterface' does not have a default object
|
Please specify constructor invocation; classifier 'SamInterface' does not have a companion object
|
||||||
+2
-2
@@ -1,5 +1,5 @@
|
|||||||
Cleaning output files:
|
Cleaning output files:
|
||||||
out/production/module/test/Klass$Default.class
|
out/production/module/test/Klass$Companion.class
|
||||||
out/production/module/test/Klass.class
|
out/production/module/test/Klass.class
|
||||||
End of files
|
End of files
|
||||||
Compiling files:
|
Compiling files:
|
||||||
@@ -7,7 +7,7 @@ src/const.kt
|
|||||||
End of files
|
End of files
|
||||||
Cleaning output files:
|
Cleaning output files:
|
||||||
out/production/module/Usage.class
|
out/production/module/Usage.class
|
||||||
out/production/module/test/Klass$Default.class
|
out/production/module/test/Klass$Companion.class
|
||||||
out/production/module/test/Klass.class
|
out/production/module/test/Klass.class
|
||||||
End of files
|
End of files
|
||||||
Compiling files:
|
Compiling files:
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
package test
|
package test
|
||||||
|
|
||||||
class Klass {
|
class Klass {
|
||||||
default object {
|
companion object {
|
||||||
// Old and new constant values are different, but their hashes are the same
|
// Old and new constant values are different, but their hashes are the same
|
||||||
val CONST = "BF"
|
val CONST = "BF"
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
package test
|
package test
|
||||||
|
|
||||||
class Klass {
|
class Klass {
|
||||||
default object {
|
companion object {
|
||||||
// Old and new constant values are different, but their hashes are the same
|
// Old and new constant values are different, but their hashes are the same
|
||||||
val CONST = "Ae"
|
val CONST = "Ae"
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
Cleaning output files:
|
Cleaning output files:
|
||||||
out/production/module/test/Klass$Default.class
|
out/production/module/test/Klass$Companion.class
|
||||||
out/production/module/test/Klass.class
|
out/production/module/test/Klass.class
|
||||||
End of files
|
End of files
|
||||||
Compiling files:
|
Compiling files:
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
package test
|
package test
|
||||||
|
|
||||||
class Klass {
|
class Klass {
|
||||||
default object {
|
companion object {
|
||||||
val CONST = "bar"
|
val CONST = "bar"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
package test
|
package test
|
||||||
|
|
||||||
class Klass {
|
class Klass {
|
||||||
default object {
|
companion object {
|
||||||
val CONST = "bar"
|
val CONST = "bar"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user