Skip to content

Commit 8480863

Browse files
Strum355Strum355
authored
bump semanticdb-kotlinc and kotlin-compiler-embeddable for kotlin 1.8 (#623)
* bump semanticdb-kotlinc and kotlin-compiler-embeddable for kotlin 1.8 * update snapshots
1 parent 5efa0ff commit 8480863

21 files changed

+447
-451
lines changed

‎build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ lazy val V =
2121
val scala3 = "3.2.2"
2222
val metals = "0.11.11"
2323
val scalameta = "4.8.1"
24-
val semanticdbKotlinc = "0.3.1"
24+
val semanticdbKotlinc = "0.3.2"
2525
val testcontainers = "0.39.3"
2626
val requests = "0.6.5"
2727
val minimalMillVersion = "0.10.0"
@@ -254,7 +254,7 @@ lazy val cli = project
254254
"com.lihaoyi" %% "requests" % V.requests,
255255
"org.scalameta" %% "moped" % V.moped,
256256
"org.scalameta" %% "ascii-graphs" % "0.1.2",
257-
"org.jetbrains.kotlin" % "kotlin-compiler-embeddable" % "1.5.21"
257+
"org.jetbrains.kotlin" % "kotlin-compiler-embeddable" % "1.8.21"
258258
),
259259
(Compile / resourceGenerators) +=
260260
Def

‎scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScipBuildTool.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ class ScipBuildTool(index: IndexCommand) extends BuildTool("SCIP", index) {
311311

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

314-
parseCommandLineArguments(args.asJava, kargs)
314+
parseCommandLineArguments(args.asJava, kargs, false)
315315

316316
val exit = new K2JVMCompiler().exec(
317317
new MessageCollector {

‎tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ abstract class GradleBuildToolSuite(allGradle: List[String])
297297
"kotlin",
298298
"""|/build.gradle
299299
|plugins {
300-
| id 'org.jetbrains.kotlin.jvm' version '1.5.31'
300+
| id 'org.jetbrains.kotlin.jvm' version '1.8.0'
301301
|}
302302
|repositories {
303303
| mavenCentral()
@@ -371,7 +371,7 @@ abstract class GradleBuildToolSuite(allGradle: List[String])
371371
s"""|/build.gradle
372372
|plugins {
373373
| id 'java'
374-
| id 'org.jetbrains.kotlin.jvm' version '1.5.31'
374+
| id 'org.jetbrains.kotlin.jvm' version '1.8.0'
375375
|}
376376
|java {
377377
| toolchain {
@@ -396,7 +396,7 @@ abstract class GradleBuildToolSuite(allGradle: List[String])
396396
s"kotlin-multiplatform-$jvmSettings",
397397
s"""|/build.gradle
398398
|plugins {
399-
| id 'org.jetbrains.kotlin.multiplatform' version '1.5.31'
399+
| id 'org.jetbrains.kotlin.multiplatform' version '1.8.0'
400400
|}
401401
|repositories {
402402
| mavenCentral()

‎tests/snapshots/src/main/generated/com/airbnb/epoxy/ActivityRecyclerPool.kt

+14-14
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ internal class ActivityRecyclerPool {
5959
// ^^^^^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/jvm/JvmOverloads#`<init>`().
6060
fun getPool(
6161
// ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#getPool().
62-
// documentation ```kt\npublic final fun getPool(context: [ERROR : Context], poolFactory: () -> [ERROR : RecyclerView.RecycledViewPool]): com.airbnb.epoxy.PoolReference\n```
62+
// 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```
6363
context: Context,
6464
// ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#getPool().(context)
65-
// documentation ```kt\nvalue-parameter context: [ERROR : Context]\n```
65+
// documentation ```kt\nvalue-parameter context: [Error type: Unresolved type for Context]\n```
6666
poolFactory: () -> RecyclerView.RecycledViewPool
6767
// ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#getPool().(poolFactory)
68-
// documentation ```kt\nvalue-parameter poolFactory: () -> [ERROR : RecyclerView.RecycledViewPool]\n```
68+
// documentation ```kt\nvalue-parameter poolFactory: () -> [Error type: Unresolved type for RecyclerView.RecycledViewPool]\n```
6969
): PoolReference {
7070
// ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/PoolReference#
7171

@@ -166,7 +166,7 @@ internal class ActivityRecyclerPool {
166166

167167
private fun Context.lifecycle(): Lifecycle? {
168168
// ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#lifecycle().
169-
// documentation ```kt\nprivate final fun [ERROR : Context].lifecycle(): androidx.lifecycle.Lifecycle?\n```
169+
// documentation ```kt\nprivate final fun [Error type: Unresolved type for Context].lifecycle(): androidx.lifecycle.Lifecycle?\n```
170170
// ^^^^^^^^^ reference semanticdb maven maven/androidx.lifecycle/lifecycle-common 2.0.0 androidx/lifecycle/Lifecycle#
171171
if (this is LifecycleOwner) {
172172
// ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#lifecycle().
@@ -188,17 +188,17 @@ internal class PoolReference(
188188
// documentation ```kt\ninternal final class PoolReference : androidx.lifecycle.LifecycleObserver\n```
189189
// relationship is_reference is_implementation semanticdb maven maven/androidx.lifecycle/lifecycle-common 2.0.0 androidx/lifecycle/LifecycleObserver#
190190
// ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#`<init>`().
191-
// documentation ```kt\npublic constructor PoolReference(context: [ERROR : Context], viewPool: [ERROR : RecyclerView.RecycledViewPool], parent: com.airbnb.epoxy.ActivityRecyclerPool)\n```
191+
// 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```
192192
context: Context,
193193
// ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#`<init>`().(context)
194-
// documentation ```kt\nvalue-parameter context: [ERROR : Context]\n```
194+
// documentation ```kt\nvalue-parameter context: [Error type: Unresolved type for Context]\n```
195195
val viewPool: RecyclerView.RecycledViewPool,
196196
// ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#`<init>`().(viewPool)
197-
// documentation ```kt\nvalue-parameter viewPool: [ERROR : RecyclerView.RecycledViewPool]\n```
197+
// documentation ```kt\nvalue-parameter viewPool: [Error type: Unresolved type for RecyclerView.RecycledViewPool]\n```
198198
// ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#getViewPool().
199-
// documentation ```kt\npublic final val viewPool: [ERROR : RecyclerView.RecycledViewPool]\n```
199+
// documentation ```kt\npublic final val viewPool: [Error type: Unresolved type for RecyclerView.RecycledViewPool]\n```
200200
// ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#viewPool.
201-
// documentation ```kt\npublic final val viewPool: [ERROR : RecyclerView.RecycledViewPool]\n```
201+
// documentation ```kt\npublic final val viewPool: [Error type: Unresolved type for RecyclerView.RecycledViewPool]\n```
202202
private val parent: ActivityRecyclerPool
203203
// ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#`<init>`().(parent)
204204
// documentation ```kt\nvalue-parameter parent: com.airbnb.epoxy.ActivityRecyclerPool\n```
@@ -211,18 +211,18 @@ internal class PoolReference(
211211
// ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/androidx.lifecycle/lifecycle-common 2.0.0 androidx/lifecycle/LifecycleObserver#
212212
private val contextReference: WeakReference<Context> = WeakReference(context)
213213
// ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#contextReference.
214-
// documentation ```kt\nprivate final val contextReference: java.lang.ref.WeakReference<[ERROR : Context]>\n```
214+
// documentation ```kt\nprivate final val contextReference: java.lang.ref.WeakReference<[Error type: Unresolved type for Context]>\n```
215215
// ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#getContextReference().
216-
// documentation ```kt\nprivate final val contextReference: java.lang.ref.WeakReference<[ERROR : Context]>\n```
216+
// documentation ```kt\nprivate final val contextReference: java.lang.ref.WeakReference<[Error type: Unresolved type for Context]>\n```
217217
// ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/ref/WeakReference#
218218
// ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/ref/WeakReference#`<init>`().
219219
// ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/PoolReference#`<init>`().(context)
220220

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

253253
internal fun Context?.isActivityDestroyed(): Boolean {
254254
// ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPoolKt#isActivityDestroyed().
255-
// documentation ```kt\ninternal fun [ERROR : Context]?.isActivityDestroyed(): kotlin.Boolean\n```
255+
// documentation ```kt\ninternal fun [Error type: Unresolved type for Context]?.isActivityDestroyed(): kotlin.Boolean\n```
256256
// ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
257257
if (this == null) {
258258
// ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPoolKt#isActivityDestroyed().

0 commit comments

Comments
 (0)