diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e9712a..88e9865 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,12 @@ ### Updated +- `com.javiersc.hubdle:com.javiersc.hubdle.gradle.plugin -> 0.8.0` +- `com.javiersc.hubdle:hubdle-version-catalog -> 0.4.0` +- `com.javiersc.kotlin:kotlin-compiler-extensions -> 0.5.1+2.1.0` +- `com.javiersc.kotlin:kotlin-compiler-gradle-extensions -> 0.5.1+2.1.0` +- `com.javiersc.kotlin:kotlin-compiler-test-extensions -> 0.5.1+2.1.0` + ## [0.13.0+2.1.0] - 2024-11-27 ### Updated diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 87e95cc..8ec3bb5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,15 +1,13 @@ [versions] -hubdle = "0.7.18" -hubdleCatalog = "0.3.13" -javiersc-kotlin-compiler-extensions = "0.5.0+2.1.0" -jetbrains-kotlin = "2.1.0" +hubdle = "0.8.0" +hubdleCatalog = "0.4.0" +javiersc-kotlin-compiler-extensions = "0.5.1+2.1.0" [libraries] hubdle-catalog = { module = "com.javiersc.hubdle:hubdle-version-catalog", version.ref = "hubdleCatalog" } javiersc-kotlin-compiler-extensions = { module = "com.javiersc.kotlin:kotlin-compiler-extensions", version.ref = "javiersc-kotlin-compiler-extensions" } javiersc-kotlin-compiler-gradle-extensions = { module = "com.javiersc.kotlin:kotlin-compiler-gradle-extensions", version.ref = "javiersc-kotlin-compiler-extensions" } javiersc-kotlin-compiler-test-extensions = { module = "com.javiersc.kotlin:kotlin-compiler-test-extensions", version.ref = "javiersc-kotlin-compiler-extensions" } -jetbrains-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "jetbrains-kotlin" } [plugins] javiersc-hubdle = { id = "com.javiersc.hubdle", version.ref = "hubdle" } diff --git a/kopy-compiler/main/kotlin/com/javiersc/kotlin/kopy/compiler/fir/checker/checkers/expression/BreakingCallsChecker.kt b/kopy-compiler/main/kotlin/com/javiersc/kotlin/kopy/compiler/fir/checker/checkers/expression/BreakingCallsChecker.kt index b2bce03..4ae07db 100644 --- a/kopy-compiler/main/kotlin/com/javiersc/kotlin/kopy/compiler/fir/checker/checkers/expression/BreakingCallsChecker.kt +++ b/kopy-compiler/main/kotlin/com/javiersc/kotlin/kopy/compiler/fir/checker/checkers/expression/BreakingCallsChecker.kt @@ -30,10 +30,10 @@ import org.jetbrains.kotlin.fir.expressions.FirResolvable import org.jetbrains.kotlin.fir.expressions.FirThisReceiverExpression import org.jetbrains.kotlin.fir.references.toResolvedFunctionSymbol import org.jetbrains.kotlin.fir.render +import org.jetbrains.kotlin.fir.resolve.toRegularClassSymbol import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol import org.jetbrains.kotlin.fir.types.resolvedType -import org.jetbrains.kotlin.fir.types.toRegularClassSymbol internal object BreakingCallsChecker : FirCallChecker(MppCheckerKind.Common) { diff --git a/kopy-compiler/main/kotlin/com/javiersc/kotlin/kopy/compiler/fir/generation/FirKopyAssignExpressionAltererExtension.kt b/kopy-compiler/main/kotlin/com/javiersc/kotlin/kopy/compiler/fir/generation/FirKopyAssignExpressionAltererExtension.kt index 090a2f9..3396301 100644 --- a/kopy-compiler/main/kotlin/com/javiersc/kotlin/kopy/compiler/fir/generation/FirKopyAssignExpressionAltererExtension.kt +++ b/kopy-compiler/main/kotlin/com/javiersc/kotlin/kopy/compiler/fir/generation/FirKopyAssignExpressionAltererExtension.kt @@ -30,7 +30,6 @@ import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.builder.buildSimpleNamedReference import org.jetbrains.kotlin.fir.references.toResolvedVariableSymbol import org.jetbrains.kotlin.fir.resolve.providers.getRegularClassSymbolByClassId -import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef @@ -50,7 +49,7 @@ internal class FirKopyAssignExpressionAltererExtension( val kopyClassClassId: ClassId = variableDispatchReceiver.resolvedType.classId ?: return null val kopyClass: FirRegularClassSymbol = - session.symbolProvider.getRegularClassSymbolByClassId(kopyClassClassId) ?: return null + session.getRegularClassSymbolByClassId(kopyClassClassId) ?: return null if (!kopyClass.hasAnnotation(classId = kopyClassId, session = session)) return null @@ -62,7 +61,7 @@ internal class FirKopyAssignExpressionAltererExtension( source = variableAssignment.source?.fakeElement(AssignmentPluginAltered) explicitReceiver = buildPropertyAccessExpression { source = leftArgument.source - coneTypeOrNull = leftResolvedType.type + coneTypeOrNull = leftResolvedType.coneType calleeReference = leftArgument variableAssignment.lValue .asFirOrNull() diff --git a/kopy-compiler/main/kotlin/com/javiersc/kotlin/kopy/compiler/fir/generation/FirKopyDeclarationGenerationExtension.kt b/kopy-compiler/main/kotlin/com/javiersc/kotlin/kopy/compiler/fir/generation/FirKopyDeclarationGenerationExtension.kt index b672942..accfd2f 100644 --- a/kopy-compiler/main/kotlin/com/javiersc/kotlin/kopy/compiler/fir/generation/FirKopyDeclarationGenerationExtension.kt +++ b/kopy-compiler/main/kotlin/com/javiersc/kotlin/kopy/compiler/fir/generation/FirKopyDeclarationGenerationExtension.kt @@ -170,7 +170,7 @@ internal class FirKopyDeclarationGenerationExtension( private fun createAtomicRefType(owner: FirClassSymbol<*>): ConeKotlinType { val atomicRefSymbol: FirRegularClassSymbol = - session.symbolProvider.getRegularClassSymbolByClassId(atomicRefClassId)!! + session.getRegularClassSymbolByClassId(atomicRefClassId)!! val fromTypeParameterSymbols: List = atomicRefSymbol.typeParameterSymbols.takeIf(List::isNotEmpty)!! @@ -209,7 +209,7 @@ internal class FirKopyDeclarationGenerationExtension( owner = owner, key = Key, name = callableId.callableName, - returnType = session.builtinTypes.unitType.type, + returnType = session.builtinTypes.unitType.coneType, config = { status { isOverride = false @@ -251,7 +251,7 @@ internal class FirKopyDeclarationGenerationExtension( owner = owner, key = Key, name = callableId.callableName, - returnType = session.builtinTypes.unitType.type, + returnType = session.builtinTypes.unitType.coneType, config = { status { isOverride = false @@ -311,7 +311,7 @@ internal class FirKopyDeclarationGenerationExtension( owner = owner, key = Key, name = callableId.callableName, - returnType = session.builtinTypes.unitType.type, + returnType = session.builtinTypes.unitType.coneType, config = { status { isOverride = false @@ -353,7 +353,7 @@ internal class FirKopyDeclarationGenerationExtension( private fun createCopyLikeFunction( callableId: CallableId, owner: FirClassSymbol<*>, - ): FirNamedFunctionSymbol? { + ): FirNamedFunctionSymbol { val copyValueParameterType: ConeKotlinType = session.substitutor( fromTypeParameters = function1Class.typeParameterSymbols, @@ -404,7 +404,6 @@ internal class FirKopyDeclarationGenerationExtension( private fun createAnnotation(classId: ClassId): FirAnnotation? = session - .symbolProvider .getRegularClassSymbolByClassId(classId = classId) ?.fir ?.symbol diff --git a/kopy-compiler/test-data/box/edge/no-kopy-annotation-on-one-data-class.fir.ir.txt b/kopy-compiler/test-data/box/edge/no-kopy-annotation-on-one-data-class.fir.ir.txt index 2f405ff..b5f38c1 100644 --- a/kopy-compiler/test-data/box/edge/no-kopy-annotation-on-one-data-class.fir.ir.txt +++ b/kopy-compiler/test-data/box/edge/no-kopy-annotation-on-one-data-class.fir.ir.txt @@ -1,3 +1,4 @@ +FILE fqName: fileName:/SomeFile.kt FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-kopy-annotation-on-one-data-class.kt CLASS CLASS name:Address modality:FINAL visibility:public [data] superTypes:[kotlin.Any] annotations: @@ -1015,4 +1016,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-kopy-annotation-on- $this: CALL 'public final fun (): com.javiersc.kotlin.kopy.playground.PrivateInfo declared in com.javiersc.kotlin.kopy.playground.Person' type=com.javiersc.kotlin.kopy.playground.PrivateInfo origin=GET_PROPERTY $this: GET_VAR 'val person2: com.javiersc.kotlin.kopy.playground.Person declared in com.javiersc.kotlin.kopy.playground.box' type=com.javiersc.kotlin.kopy.playground.Person origin=null CONST String type=kotlin.String value=" is not equal to SSN 42" -FILE fqName: fileName:/SomeFile.kt diff --git a/kopy-compiler/test-data/box/edge/simple-1.fir.ir.txt b/kopy-compiler/test-data/box/edge/simple-1.fir.ir.txt index a324e11..373cc82 100644 --- a/kopy-compiler/test-data/box/edge/simple-1.fir.ir.txt +++ b/kopy-compiler/test-data/box/edge/simple-1.fir.ir.txt @@ -1,3 +1,4 @@ +FILE fqName: fileName:/SomeFile.kt FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/simple-1.kt CLASS CLASS name:House modality:FINAL visibility:public [data] superTypes:[kotlin.Any] annotations: @@ -513,4 +514,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/simple-1.kt GET_VAR 'val house1: com.javiersc.kotlin.kopy.playground.House declared in com.javiersc.kotlin.kopy.playground.box' type=com.javiersc.kotlin.kopy.playground.House origin=null CONST String type=kotlin.String value=" is not equal to " GET_VAR 'val house2: com.javiersc.kotlin.kopy.playground.House declared in com.javiersc.kotlin.kopy.playground.box' type=com.javiersc.kotlin.kopy.playground.House origin=null -FILE fqName: fileName:/SomeFile.kt diff --git a/kopy-compiler/test-data/box/nest-copy-set.fir.ir.txt b/kopy-compiler/test-data/box/nest-copy-set.fir.ir.txt index ead6f76..ce6c08c 100644 --- a/kopy-compiler/test-data/box/nest-copy-set.fir.ir.txt +++ b/kopy-compiler/test-data/box/nest-copy-set.fir.ir.txt @@ -1,3 +1,4 @@ +FILE fqName: fileName:/SomeFile.kt FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/nest-copy-set.kt CLASS CLASS name:Bar modality:FINAL visibility:public [data] superTypes:[kotlin.Any] annotations: @@ -936,4 +937,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/nest-copy-set.kt $this: CALL 'public final fun (): com.javiersc.kotlin.kopy.playground.Bar declared in com.javiersc.kotlin.kopy.playground.Foo' type=com.javiersc.kotlin.kopy.playground.Bar origin=GET_PROPERTY $this: GET_VAR 'val foo21: com.javiersc.kotlin.kopy.playground.Foo declared in com.javiersc.kotlin.kopy.playground.box' type=com.javiersc.kotlin.kopy.playground.Foo origin=null CONST String type=kotlin.String value=" instead of 42" -FILE fqName: fileName:/SomeFile.kt diff --git a/kopy-compiler/test-data/box/nest-copy-update.fir.ir.txt b/kopy-compiler/test-data/box/nest-copy-update.fir.ir.txt index 51ef451..a173b6c 100644 --- a/kopy-compiler/test-data/box/nest-copy-update.fir.ir.txt +++ b/kopy-compiler/test-data/box/nest-copy-update.fir.ir.txt @@ -1,3 +1,4 @@ +FILE fqName: fileName:/SomeFile.kt FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/nest-copy-update.kt CLASS CLASS name:Bar modality:FINAL visibility:public [data] superTypes:[kotlin.Any] annotations: @@ -943,4 +944,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/nest-copy-update.kt $this: CALL 'public final fun (): com.javiersc.kotlin.kopy.playground.Bar declared in com.javiersc.kotlin.kopy.playground.Foo' type=com.javiersc.kotlin.kopy.playground.Bar origin=GET_PROPERTY $this: GET_VAR 'val foo21: com.javiersc.kotlin.kopy.playground.Foo declared in com.javiersc.kotlin.kopy.playground.box' type=com.javiersc.kotlin.kopy.playground.Foo origin=null CONST String type=kotlin.String value=" instead of 49" -FILE fqName: fileName:/SomeFile.kt diff --git a/kopy-compiler/test-data/box/nested-copy/simple-1.fir.ir.txt b/kopy-compiler/test-data/box/nested-copy/simple-1.fir.ir.txt index 747e0e6..b5459ca 100644 --- a/kopy-compiler/test-data/box/nested-copy/simple-1.fir.ir.txt +++ b/kopy-compiler/test-data/box/nested-copy/simple-1.fir.ir.txt @@ -1,3 +1,4 @@ +FILE fqName: fileName:/SomeFile.kt FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/simple-1.kt CLASS CLASS name:Foo modality:FINAL visibility:public [data] superTypes:[kotlin.Any] annotations: @@ -308,4 +309,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/simple-1.kt then: STRING_CONCATENATION type=kotlin.String CONST String type=kotlin.String value="Fail: " GET_VAR 'val foo21: com.javiersc.kotlin.kopy.playground.Foo declared in com.javiersc.kotlin.kopy.playground.box' type=com.javiersc.kotlin.kopy.playground.Foo origin=null -FILE fqName: fileName:/SomeFile.kt diff --git a/kopy-compiler/test-data/box/no-nest-copy-set.fir.ir.txt b/kopy-compiler/test-data/box/no-nest-copy-set.fir.ir.txt index 2bb3e4c..ec6a9c5 100644 --- a/kopy-compiler/test-data/box/no-nest-copy-set.fir.ir.txt +++ b/kopy-compiler/test-data/box/no-nest-copy-set.fir.ir.txt @@ -1,3 +1,4 @@ +FILE fqName: fileName:/SomeFile.kt FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-set.kt CLASS CLASS name:Foo modality:FINAL visibility:public [data] superTypes:[kotlin.Any] annotations: @@ -273,4 +274,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-set.kt CALL 'public final fun (): kotlin.Int declared in com.javiersc.kotlin.kopy.playground.Foo' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR 'val foo21: com.javiersc.kotlin.kopy.playground.Foo declared in com.javiersc.kotlin.kopy.playground.box' type=com.javiersc.kotlin.kopy.playground.Foo origin=null CONST String type=kotlin.String value=" instead of 42" -FILE fqName: fileName:/SomeFile.kt diff --git a/kopy-compiler/test-data/box/no-nest-copy-update-each-no-it.fir.ir.txt b/kopy-compiler/test-data/box/no-nest-copy-update-each-no-it.fir.ir.txt index cb5a96b..853424b 100644 --- a/kopy-compiler/test-data/box/no-nest-copy-update-each-no-it.fir.ir.txt +++ b/kopy-compiler/test-data/box/no-nest-copy-update-each-no-it.fir.ir.txt @@ -1,3 +1,4 @@ +FILE fqName: fileName:/SomeFile.kt FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-update-each-no-it.kt CLASS CLASS name:Foo modality:FINAL visibility:public [data] superTypes:[kotlin.Any] annotations: @@ -301,4 +302,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-update-ea CALL 'public final fun (): kotlin.collections.List declared in com.javiersc.kotlin.kopy.playground.Foo' type=kotlin.collections.List origin=GET_PROPERTY $this: GET_VAR 'val foo21: com.javiersc.kotlin.kopy.playground.Foo declared in com.javiersc.kotlin.kopy.playground.box' type=com.javiersc.kotlin.kopy.playground.Foo origin=null CONST String type=kotlin.String value=" instead of all being 42" -FILE fqName: fileName:/SomeFile.kt diff --git a/kopy-compiler/test-data/box/no-nest-copy-update-each-with-custom-parameter.fir.ir.txt b/kopy-compiler/test-data/box/no-nest-copy-update-each-with-custom-parameter.fir.ir.txt index ded1dcc..93678f9 100644 --- a/kopy-compiler/test-data/box/no-nest-copy-update-each-with-custom-parameter.fir.ir.txt +++ b/kopy-compiler/test-data/box/no-nest-copy-update-each-with-custom-parameter.fir.ir.txt @@ -1,3 +1,4 @@ +FILE fqName: fileName:/SomeFile.kt FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-update-each-with-custom-parameter.kt CLASS CLASS name:Foo modality:FINAL visibility:public [data] superTypes:[kotlin.Any] annotations: @@ -299,4 +300,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-update-ea CALL 'public final fun (): kotlin.collections.List declared in com.javiersc.kotlin.kopy.playground.Foo' type=kotlin.collections.List origin=GET_PROPERTY $this: GET_VAR 'val foo21: com.javiersc.kotlin.kopy.playground.Foo declared in com.javiersc.kotlin.kopy.playground.box' type=com.javiersc.kotlin.kopy.playground.Foo origin=null CONST String type=kotlin.String value=" instead of 49 and 45" -FILE fqName: fileName:/SomeFile.kt diff --git a/kopy-compiler/test-data/box/no-nest-copy-update-each-with-it.fir.ir.txt b/kopy-compiler/test-data/box/no-nest-copy-update-each-with-it.fir.ir.txt index 4d2e885..54fbb84 100644 --- a/kopy-compiler/test-data/box/no-nest-copy-update-each-with-it.fir.ir.txt +++ b/kopy-compiler/test-data/box/no-nest-copy-update-each-with-it.fir.ir.txt @@ -1,3 +1,4 @@ +FILE fqName: fileName:/SomeFile.kt FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-update-each-with-it.kt CLASS CLASS name:Foo modality:FINAL visibility:public [data] superTypes:[kotlin.Any] annotations: @@ -299,4 +300,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-update-ea CALL 'public final fun (): kotlin.collections.List declared in com.javiersc.kotlin.kopy.playground.Foo' type=kotlin.collections.List origin=GET_PROPERTY $this: GET_VAR 'val foo21: com.javiersc.kotlin.kopy.playground.Foo declared in com.javiersc.kotlin.kopy.playground.box' type=com.javiersc.kotlin.kopy.playground.Foo origin=null CONST String type=kotlin.String value=" instead of 49 and 45" -FILE fqName: fileName:/SomeFile.kt diff --git a/kopy-compiler/test-data/box/no-nest-copy-update-no-it.fir.ir.txt b/kopy-compiler/test-data/box/no-nest-copy-update-no-it.fir.ir.txt index 953490f..233822d 100644 --- a/kopy-compiler/test-data/box/no-nest-copy-update-no-it.fir.ir.txt +++ b/kopy-compiler/test-data/box/no-nest-copy-update-no-it.fir.ir.txt @@ -1,3 +1,4 @@ +FILE fqName: fileName:/SomeFile.kt FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-update-no-it.kt CLASS CLASS name:Foo modality:FINAL visibility:public [data] superTypes:[kotlin.Any] annotations: @@ -278,4 +279,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-update-no CALL 'public final fun (): kotlin.Int declared in com.javiersc.kotlin.kopy.playground.Foo' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR 'val foo21: com.javiersc.kotlin.kopy.playground.Foo declared in com.javiersc.kotlin.kopy.playground.box' type=com.javiersc.kotlin.kopy.playground.Foo origin=null CONST String type=kotlin.String value=" instead of 42" -FILE fqName: fileName:/SomeFile.kt diff --git a/kopy-compiler/test-data/box/no-nest-copy-update-with-custom-parameter.fir.ir.txt b/kopy-compiler/test-data/box/no-nest-copy-update-with-custom-parameter.fir.ir.txt index 2dea3dc..2ddb265 100644 --- a/kopy-compiler/test-data/box/no-nest-copy-update-with-custom-parameter.fir.ir.txt +++ b/kopy-compiler/test-data/box/no-nest-copy-update-with-custom-parameter.fir.ir.txt @@ -1,3 +1,4 @@ +FILE fqName: fileName:/SomeFile.kt FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-update-with-custom-parameter.kt CLASS CLASS name:Foo modality:FINAL visibility:public [data] superTypes:[kotlin.Any] annotations: @@ -280,4 +281,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-update-wi CALL 'public final fun (): kotlin.Int declared in com.javiersc.kotlin.kopy.playground.Foo' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR 'val foo21: com.javiersc.kotlin.kopy.playground.Foo declared in com.javiersc.kotlin.kopy.playground.box' type=com.javiersc.kotlin.kopy.playground.Foo origin=null CONST String type=kotlin.String value=" instead of 42" -FILE fqName: fileName:/SomeFile.kt diff --git a/kopy-compiler/test-data/box/no-nest-copy-update-with-it.fir.ir.txt b/kopy-compiler/test-data/box/no-nest-copy-update-with-it.fir.ir.txt index d60d870..fab7b6b 100644 --- a/kopy-compiler/test-data/box/no-nest-copy-update-with-it.fir.ir.txt +++ b/kopy-compiler/test-data/box/no-nest-copy-update-with-it.fir.ir.txt @@ -1,3 +1,4 @@ +FILE fqName: fileName:/SomeFile.kt FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-update-with-it.kt CLASS CLASS name:Foo modality:FINAL visibility:public [data] superTypes:[kotlin.Any] annotations: @@ -280,4 +281,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-update-wi CALL 'public final fun (): kotlin.Int declared in com.javiersc.kotlin.kopy.playground.Foo' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR 'val foo21: com.javiersc.kotlin.kopy.playground.Foo declared in com.javiersc.kotlin.kopy.playground.box' type=com.javiersc.kotlin.kopy.playground.Foo origin=null CONST String type=kotlin.String value=" instead of 42" -FILE fqName: fileName:/SomeFile.kt diff --git a/kopy-compiler/test-data/box/repeated-properties/complex-1.fir.ir.txt b/kopy-compiler/test-data/box/repeated-properties/complex-1.fir.ir.txt index 855fab9..bf4f0e6 100644 --- a/kopy-compiler/test-data/box/repeated-properties/complex-1.fir.ir.txt +++ b/kopy-compiler/test-data/box/repeated-properties/complex-1.fir.ir.txt @@ -1,3 +1,4 @@ +FILE fqName: fileName:/SomeFile.kt FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/complex-1.kt CLASS CLASS name:Bar modality:FINAL visibility:public [data] superTypes:[kotlin.Any] annotations: @@ -1063,4 +1064,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/complex-1.kt then: STRING_CONCATENATION type=kotlin.String CONST String type=kotlin.String value="Fail:\n" GET_VAR 'val foo2: com.javiersc.kotlin.kopy.playground.Foo declared in com.javiersc.kotlin.kopy.playground.box' type=com.javiersc.kotlin.kopy.playground.Foo origin=null -FILE fqName: fileName:/SomeFile.kt diff --git a/kopy-compiler/test-data/box/repeated-properties/complex-2.fir.ir.txt b/kopy-compiler/test-data/box/repeated-properties/complex-2.fir.ir.txt index 573676b..22a532f 100644 --- a/kopy-compiler/test-data/box/repeated-properties/complex-2.fir.ir.txt +++ b/kopy-compiler/test-data/box/repeated-properties/complex-2.fir.ir.txt @@ -1,3 +1,4 @@ +FILE fqName: fileName:/SomeFile.kt FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/complex-2.kt CLASS CLASS name:Bar modality:FINAL visibility:public [data] superTypes:[kotlin.Any] annotations: @@ -1163,4 +1164,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/complex-2.kt then: STRING_CONCATENATION type=kotlin.String CONST String type=kotlin.String value="Fail:\n" GET_VAR 'val foo2: com.javiersc.kotlin.kopy.playground.Foo declared in com.javiersc.kotlin.kopy.playground.box' type=com.javiersc.kotlin.kopy.playground.Foo origin=null -FILE fqName: fileName:/SomeFile.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index 9acafdb..d2661fc 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -46,25 +46,6 @@ val hubdleCatalogVersion: String = val kotlinCompilerExtensionsVersion: String = catalogFile.first { it.contains("javiersc-kotlin-compiler-extensions =") }.split("\"")[1] -buildscript { - dependencies { - val kotlinVersion: String = - file("$rootDir/gradle/libs.versions.toml") - .readLines() - .first { it.contains("jetbrains-kotlin") } - .split("\"")[1] - - val kotlinModule = - file("$rootDir/gradle/libs.versions.toml") - .readLines() - .first { it.contains("jetbrains-kotlin-gradle-plugin") } - .split("\"")[1] - - val kotlinDependency = "$kotlinModule:$kotlinVersion" - classpath(kotlinDependency) - } -} - hubdleSettings { catalog { // version(hubdleCatalogVersion)