Skip to content

Commit

Permalink
bump semanticdb-kotlinc and kotlin-compiler-embeddable for kotlin 1.8 (…
Browse files Browse the repository at this point in the history 
…#623)

* bump semanticdb-kotlinc and kotlin-compiler-embeddable for kotlin 1.8

* update snapshots
  • Loading branch information
@Strum355
Strum355 authored Jul 26, 2023
1 parent 5efa0ff commit 8480863
Show file tree
Hide file tree
Showing 21 changed files with 447 additions and 451 deletions.
4 changes: 2 additions & 2 deletions build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ lazy val V =
val scala3 = "3.2.2"
val metals = "0.11.11"
val scalameta = "4.8.1"
val semanticdbKotlinc = "0.3.1"
val semanticdbKotlinc = "0.3.2"
val testcontainers = "0.39.3"
val requests = "0.6.5"
val minimalMillVersion = "0.10.0"
Expand Down Expand Up @@ -254,7 +254,7 @@ lazy val cli = project
"com.lihaoyi" %% "requests" % V.requests,
"org.scalameta" %% "moped" % V.moped,
"org.scalameta" %% "ascii-graphs" % "0.1.2",
"org.jetbrains.kotlin" % "kotlin-compiler-embeddable" % "1.5.21"
"org.jetbrains.kotlin" % "kotlin-compiler-embeddable" % "1.8.21"
),
(Compile / resourceGenerators) +=
Def
Expand Down
2 changes: 1 addition & 1 deletion scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScipBuildTool.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ class ScipBuildTool(index: IndexCommand) extends BuildTool("SCIP", index) {

args ++= filesPaths ++ commonKotlinFiles.map(_.toAbsolutePath.toString)

parseCommandLineArguments(args.asJava, kargs)
parseCommandLineArguments(args.asJava, kargs, false)

val exit = new K2JVMCompiler().exec(
new MessageCollector {
Expand Down
6 changes: 3 additions & 3 deletions tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ abstract class GradleBuildToolSuite(allGradle: List[String])
"kotlin",
"""|/build.gradle
|plugins {
| id 'org.jetbrains.kotlin.jvm' version '1.5.31'
| id 'org.jetbrains.kotlin.jvm' version '1.8.0'
|}
|repositories {
| mavenCentral()
Expand Down Expand Up @@ -371,7 +371,7 @@ abstract class GradleBuildToolSuite(allGradle: List[String])
s"""|/build.gradle
|plugins {
| id 'java'
| id 'org.jetbrains.kotlin.jvm' version '1.5.31'
| id 'org.jetbrains.kotlin.jvm' version '1.8.0'
|}
|java {
| toolchain {
Expand All @@ -396,7 +396,7 @@ abstract class GradleBuildToolSuite(allGradle: List[String])
s"kotlin-multiplatform-$jvmSettings",
s"""|/build.gradle
|plugins {
| id 'org.jetbrains.kotlin.multiplatform' version '1.5.31'
| id 'org.jetbrains.kotlin.multiplatform' version '1.8.0'
|}
|repositories {
| mavenCentral()
Expand Down
28 changes: 14 additions & 14 deletions tests/snapshots/src/main/generated/com/airbnb/epoxy/ActivityRecyclerPool.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ internal class ActivityRecyclerPool {
// ^^^^^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/jvm/JvmOverloads#`<init>`().
fun getPool(
// ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#getPool().
// documentation ```kt\npublic final fun getPool(context: [ERROR : Context], poolFactory: () -> [ERROR : RecyclerView.RecycledViewPool]): com.airbnb.epoxy.PoolReference\n```
// documentation ```kt\npublic final fun getPool(context: [Error type: Unresolved type for Context], poolFactory: () -> [Error type: Unresolved type for RecyclerView.RecycledViewPool]): com.airbnb.epoxy.PoolReference\n```
context: Context,
// ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#getPool().(context)
// documentation ```kt\nvalue-parameter context: [ERROR : Context]\n```
// documentation ```kt\nvalue-parameter context: [Error type: Unresolved type for Context]\n```
poolFactory: () -> RecyclerView.RecycledViewPool
// ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#getPool().(poolFactory)
// documentation ```kt\nvalue-parameter poolFactory: () -> [ERROR : RecyclerView.RecycledViewPool]\n```
// documentation ```kt\nvalue-parameter poolFactory: () -> [Error type: Unresolved type for RecyclerView.RecycledViewPool]\n```
): PoolReference {
// ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/PoolReference#

Expand Down Expand Up @@ -166,7 +166,7 @@ internal class ActivityRecyclerPool {

private fun Context.lifecycle(): Lifecycle? {
// ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#lifecycle().
// documentation ```kt\nprivate final fun [ERROR : Context].lifecycle(): androidx.lifecycle.Lifecycle?\n```
// documentation ```kt\nprivate final fun [Error type: Unresolved type for Context].lifecycle(): androidx.lifecycle.Lifecycle?\n```
// ^^^^^^^^^ reference semanticdb maven maven/androidx.lifecycle/lifecycle-common 2.0.0 androidx/lifecycle/Lifecycle#
if (this is LifecycleOwner) {
// ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#lifecycle().
Expand All @@ -188,17 +188,17 @@ internal class PoolReference(
// documentation ```kt\ninternal final class PoolReference : androidx.lifecycle.LifecycleObserver\n```
// relationship is_reference is_implementation semanticdb maven maven/androidx.lifecycle/lifecycle-common 2.0.0 androidx/lifecycle/LifecycleObserver#
// ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#`<init>`().
// documentation ```kt\npublic constructor PoolReference(context: [ERROR : Context], viewPool: [ERROR : RecyclerView.RecycledViewPool], parent: com.airbnb.epoxy.ActivityRecyclerPool)\n```
// documentation ```kt\npublic constructor PoolReference(context: [Error type: Unresolved type for Context], viewPool: [Error type: Unresolved type for RecyclerView.RecycledViewPool], parent: com.airbnb.epoxy.ActivityRecyclerPool)\n```
context: Context,
// ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#`<init>`().(context)
// documentation ```kt\nvalue-parameter context: [ERROR : Context]\n```
// documentation ```kt\nvalue-parameter context: [Error type: Unresolved type for Context]\n```
val viewPool: RecyclerView.RecycledViewPool,
// ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#`<init>`().(viewPool)
// documentation ```kt\nvalue-parameter viewPool: [ERROR : RecyclerView.RecycledViewPool]\n```
// documentation ```kt\nvalue-parameter viewPool: [Error type: Unresolved type for RecyclerView.RecycledViewPool]\n```
// ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#getViewPool().
// documentation ```kt\npublic final val viewPool: [ERROR : RecyclerView.RecycledViewPool]\n```
// documentation ```kt\npublic final val viewPool: [Error type: Unresolved type for RecyclerView.RecycledViewPool]\n```
// ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#viewPool.
// documentation ```kt\npublic final val viewPool: [ERROR : RecyclerView.RecycledViewPool]\n```
// documentation ```kt\npublic final val viewPool: [Error type: Unresolved type for RecyclerView.RecycledViewPool]\n```
private val parent: ActivityRecyclerPool
// ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#`<init>`().(parent)
// documentation ```kt\nvalue-parameter parent: com.airbnb.epoxy.ActivityRecyclerPool\n```
Expand All @@ -211,18 +211,18 @@ internal class PoolReference(
// ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/androidx.lifecycle/lifecycle-common 2.0.0 androidx/lifecycle/LifecycleObserver#
private val contextReference: WeakReference<Context> = WeakReference(context)
// ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#contextReference.
// documentation ```kt\nprivate final val contextReference: java.lang.ref.WeakReference<[ERROR : Context]>\n```
// documentation ```kt\nprivate final val contextReference: java.lang.ref.WeakReference<[Error type: Unresolved type for Context]>\n```
// ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#getContextReference().
// documentation ```kt\nprivate final val contextReference: java.lang.ref.WeakReference<[ERROR : Context]>\n```
// documentation ```kt\nprivate final val contextReference: java.lang.ref.WeakReference<[Error type: Unresolved type for Context]>\n```
// ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/ref/WeakReference#
// ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/ref/WeakReference#`<init>`().
// ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/PoolReference#`<init>`().(context)

val context: Context? get() = contextReference.get()
// ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#context.
// documentation ```kt\npublic final val context: [ERROR : Context]?\n```
// documentation ```kt\npublic final val context: [Error type: Unresolved type for Context]?\n```
// ^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#getContext().
// documentation ```kt\npublic final fun <get-context>(): [ERROR : Context]?\n```
// documentation ```kt\npublic final fun `<get-context>`(): [Error type: Unresolved type for Context]?\n```
// ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/PoolReference#contextReference.
// ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/PoolReference#getContextReference().
// ^^^ reference semanticdb maven jdk 11 java/lang/ref/WeakReference#get().
Expand Down Expand Up @@ -252,7 +252,7 @@ internal class PoolReference(

internal fun Context?.isActivityDestroyed(): Boolean {
// ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPoolKt#isActivityDestroyed().
// documentation ```kt\ninternal fun [ERROR : Context]?.isActivityDestroyed(): kotlin.Boolean\n```
// documentation ```kt\ninternal fun [Error type: Unresolved type for Context]?.isActivityDestroyed(): kotlin.Boolean\n```
// ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
if (this == null) {
// ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPoolKt#isActivityDestroyed().
Expand Down
Loading

0 comments on commit 8480863

Please sign in to comment.