Merge pull request querydsl#2838 from querydsl/dependabot/maven/kotli…

…n.version-1.5.20-M1 Bump kotlin.version from 1.4.20-M1 to 1.5.20-M1
yorlov · Jun 2, 2021 · ee5cbfd · ee5cbfd
2 parents bf5a403 + 18fa4c3
commit ee5cbfd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml b/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml
@@ -12,7 +12,7 @@
     <name>Querydsl example - Kotlin JPA</name>
 
     <properties>
-        <kotlin.version>1.4.30-RC</kotlin.version>
+        <kotlin.version>1.5.20-M1</kotlin.version>
     </properties>
 
     <dependencies>

diff --git a/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml b/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml
@@ -12,7 +12,7 @@
     <name>Querydsl example - Kotlin MongoDB</name>
 
     <properties>
-        <kotlin.version>1.4.30-RC</kotlin.version>
+        <kotlin.version>1.5.20-M1</kotlin.version>
     </properties>
 
 

diff --git a/querydsl-kotlin/pom.xml b/querydsl-kotlin/pom.xml
@@ -13,7 +13,7 @@
     <name>Querydsl - Kotlin extensions</name>
 
     <properties>
-        <kotlin.version>1.4.30-RC</kotlin.version>
+        <kotlin.version>1.5.20-M1</kotlin.version>
     </properties>
 
     <dependencies>

diff --git a/querydsl-kotlin/src/test/kotlin/com/querydsl/kotlin/CollectionTest.kt b/querydsl-kotlin/src/test/kotlin/com/querydsl/kotlin/CollectionTest.kt
@@ -69,10 +69,10 @@ class CollectionTest {
         val someIndex = Expressions.numberPath(Int::class.java, "idx")
 
         val firstChar = someString[0]
-        assertEquals(someString.charAt(0), firstChar)
+        assertEquals<SimpleExpression<out Any>?>(someString.charAt(0), firstChar)
 
         val firstCharExpr = someString[someIndex];
-        assertEquals(someString.charAt(someIndex), firstCharExpr)
+        assertEquals<SimpleExpression<out Any>?>(someString.charAt(someIndex), firstCharExpr)
 
         val stringConcat = someString + someOtherString + "c"
         assertEquals(someString.concat(someOtherString).concat("c"), stringConcat)