Skip to content

Commit

Permalink
Update all dependencies
Browse files Browse the repository at this point in the history
| datasource | package                                               | from        | to          |
| ---------- | ----------------------------------------------------- | ----------- | ----------- |
| maven      | com.javiersc.kotlin:kotlin-compiler-test-extensions   | 0.5.0+2.1.0 | 0.5.1+2.1.0 |
| maven      | com.javiersc.kotlin:kotlin-compiler-gradle-extensions | 0.5.0+2.1.0 | 0.5.1+2.1.0 |
| maven      | com.javiersc.kotlin:kotlin-compiler-extensions        | 0.5.0+2.1.0 | 0.5.1+2.1.0 |
| maven      | com.javiersc.hubdle:hubdle-version-catalog            | 0.3.13      | 0.4.0       |
| maven      | com.javiersc.hubdle:com.javiersc.hubdle.gradle.plugin | 0.7.18      | 0.8.0       |
  • Loading branch information
renovate[bot] committed Nov 28, 2024
1 parent 7c2e03a commit 19741d3
Show file tree
Hide file tree
Showing 20 changed files with 31 additions and 48 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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" }
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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<FirQualifiedAccessExpression>()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<FirTypeParameterSymbol> =
atomicRefSymbol.typeParameterSymbols.takeIf(List<FirTypeParameterSymbol>::isNotEmpty)!!
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -353,7 +353,7 @@ internal class FirKopyDeclarationGenerationExtension(
private fun createCopyLikeFunction(
callableId: CallableId,
owner: FirClassSymbol<*>,
): FirNamedFunctionSymbol? {
): FirNamedFunctionSymbol {
val copyValueParameterType: ConeKotlinType =
session.substitutor(
fromTypeParameters = function1Class.typeParameterSymbols,
Expand Down Expand Up @@ -404,7 +404,6 @@ internal class FirKopyDeclarationGenerationExtension(

private fun createAnnotation(classId: ClassId): FirAnnotation? =
session
.symbolProvider
.getRegularClassSymbolByClassId(classId = classId)
?.fir
?.symbol
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FILE fqName:<root> 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:
Expand Down Expand Up @@ -1015,4 +1016,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-kopy-annotation-on-
$this: CALL 'public final fun <get-privateInfo> (): 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:<root> fileName:/SomeFile.kt
2 changes: 1 addition & 1 deletion kopy-compiler/test-data/box/edge/simple-1.fir.ir.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FILE fqName:<root> 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:
Expand Down Expand Up @@ -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:<root> fileName:/SomeFile.kt
2 changes: 1 addition & 1 deletion kopy-compiler/test-data/box/nest-copy-set.fir.ir.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FILE fqName:<root> 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:
Expand Down Expand Up @@ -936,4 +937,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/nest-copy-set.kt
$this: CALL 'public final fun <get-bar> (): 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:<root> fileName:/SomeFile.kt
2 changes: 1 addition & 1 deletion kopy-compiler/test-data/box/nest-copy-update.fir.ir.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FILE fqName:<root> 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:
Expand Down Expand Up @@ -943,4 +944,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/nest-copy-update.kt
$this: CALL 'public final fun <get-bar> (): 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:<root> fileName:/SomeFile.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FILE fqName:<root> 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:
Expand Down Expand Up @@ -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:<root> fileName:/SomeFile.kt
2 changes: 1 addition & 1 deletion kopy-compiler/test-data/box/no-nest-copy-set.fir.ir.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FILE fqName:<root> 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:
Expand Down Expand Up @@ -273,4 +274,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-set.kt
CALL 'public final fun <get-number> (): 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:<root> fileName:/SomeFile.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FILE fqName:<root> 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:
Expand Down Expand Up @@ -301,4 +302,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-update-ea
CALL 'public final fun <get-numbers> (): kotlin.collections.List<kotlin.Int> declared in com.javiersc.kotlin.kopy.playground.Foo' type=kotlin.collections.List<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 all being 42"
FILE fqName:<root> fileName:/SomeFile.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FILE fqName:<root> 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:
Expand Down Expand Up @@ -299,4 +300,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-update-ea
CALL 'public final fun <get-numbers> (): kotlin.collections.List<kotlin.Int> declared in com.javiersc.kotlin.kopy.playground.Foo' type=kotlin.collections.List<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 49 and 45"
FILE fqName:<root> fileName:/SomeFile.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FILE fqName:<root> 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:
Expand Down Expand Up @@ -299,4 +300,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-update-ea
CALL 'public final fun <get-numbers> (): kotlin.collections.List<kotlin.Int> declared in com.javiersc.kotlin.kopy.playground.Foo' type=kotlin.collections.List<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 49 and 45"
FILE fqName:<root> fileName:/SomeFile.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FILE fqName:<root> 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:
Expand Down Expand Up @@ -278,4 +279,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-update-no
CALL 'public final fun <get-number> (): 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:<root> fileName:/SomeFile.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FILE fqName:<root> 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:
Expand Down Expand Up @@ -280,4 +281,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-update-wi
CALL 'public final fun <get-number> (): 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:<root> fileName:/SomeFile.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FILE fqName:<root> 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:
Expand Down Expand Up @@ -280,4 +281,3 @@ FILE fqName:com.javiersc.kotlin.kopy.playground fileName:/no-nest-copy-update-wi
CALL 'public final fun <get-number> (): 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:<root> fileName:/SomeFile.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FILE fqName:<root> 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:
Expand Down Expand Up @@ -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:<root> fileName:/SomeFile.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FILE fqName:<root> 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:
Expand Down Expand Up @@ -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:<root> fileName:/SomeFile.kt
19 changes: 0 additions & 19 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 19741d3

Please sign in to comment.