Skip to content

Commit 50fd968

Browse files
olafurpgolafurpg
authored
Merge pull request #615 from sourcegraph/olafurpg/bump-kotlin
Upgrade to the latest semanticdb-kotlinc
2 parents b3d6ae2 + 08a0cc8 commit 50fd968

File tree

8 files changed

+23
-1
lines changed

8 files changed

+23
-1
lines changed

‎build.sbt‎

Lines changed: 1 addition & 1 deletion
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.0"
24+
val semanticdbKotlinc = "0.3.1"
2525
val testcontainers = "0.39.3"
2626
val requests = "0.6.5"
2727
val minimalMillVersion = "0.10.0"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ internal class ActivityRecyclerPool {
186186
internal class PoolReference(
187187
// ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#
188188
// documentation ```kt\ninternal final class PoolReference : androidx.lifecycle.LifecycleObserver\n```
189+
// relationship is_reference is_implementation semanticdb maven maven/androidx.lifecycle/lifecycle-common 2.0.0 androidx/lifecycle/LifecycleObserver#
189190
// ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#`<init>`().
190191
// documentation ```kt\npublic constructor PoolReference(context: [ERROR : Context], viewPool: [ERROR : RecyclerView.RecycledViewPool], parent: com.airbnb.epoxy.ActivityRecyclerPool)\n```
191192
context: Context,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -981,6 +981,7 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
981981
override fun buildModels(controller: EpoxyController) {
982982
// ^^^^^^^^^^^ definition local 13
983983
// documentation ```kt\npublic open fun buildModels(controller: [ERROR : EpoxyController])\n```
984+
// relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#ModelBuilderCallback#buildModels().
984985
// ^^^^^^^^^^ definition local 14
985986
// documentation ```kt\nvalue-parameter controller: [ERROR : EpoxyController]\n```
986987
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import androidx.annotation.LayoutRes
3232
abstract class GroupModel : EpoxyModelGroup, ModelCollector {
3333
// ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/GroupModel#
3434
// documentation ```kt\npublic abstract class GroupModel : com.airbnb.epoxy.ModelCollector\n```\n\n----\n\n\n An [EpoxyModelGroup] usable in a DSL manner via the [group] extension.\n <p>\n Example:\n ```\n group {\n id("photos")\n layout(R.layout.photo_grid)\n\n // add your models here, example:\n for (photo in photos) {\n imageView {\n id(photo.id)\n url(photo.url)\n }\n }\n }\n ```\n
35+
// relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/ModelCollector#
3536
// ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelCollector#
3637
constructor() : super()
3738
// ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/GroupModel#`<init>`().
@@ -48,6 +49,7 @@ abstract class GroupModel : EpoxyModelGroup, ModelCollector {
4849
override fun add(model: EpoxyModel<*>) {
4950
// ^^^ definition semanticdb maven . . com/airbnb/epoxy/GroupModel#add().
5051
// documentation ```kt\npublic open fun add(model: [ERROR : EpoxyModel<*>]<out [ERROR : *]>)\n```
52+
// relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/ModelCollector#add().
5153
// ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/GroupModel#add().(model)
5254
// documentation ```kt\nvalue-parameter model: [ERROR : EpoxyModel<*>]<out [ERROR : *]>\n```
5355
super.addModel(model)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ package com.airbnb.epoxy
1010
interface ModelCollector {
1111
// ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelCollector#
1212
// documentation ```kt\npublic interface ModelCollector\n```\n\n----\n\n\n Interface used to collect models. Used by [EpoxyController]. It is also convenient to build DSL\n helpers for carousel: @link https://github.com/airbnb/epoxy/issues/847.\n
13+
// relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/GroupModel#
1314

1415
fun add(model: EpoxyModel<*>)
1516
// ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelCollector#add().
1617
// documentation ```kt\npublic abstract fun add(model: [ERROR : EpoxyModel<*>]<out [ERROR : *]>)\n```
18+
// relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/GroupModel#add().
1719
// ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelCollector#add().(model)
1820
// documentation ```kt\nvalue-parameter model: [ERROR : EpoxyModel<*>]<out [ERROR : *]>\n```
1921
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ class WrappedEpoxyModelClickListener<T : EpoxyModel<*>, V> : OnClickListener, On
280280
override fun iterator() = this@children.iterator()
281281
// ^^^^^^^^ definition local 6
282282
// documentation ```kt\npublic open fun iterator(): [ERROR : <ERROR FUNCTION RETURN TYPE>]\n```
283+
// relationship is_reference is_implementation semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/sequences/Sequence#iterator().
283284
// ^^^^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#children.
284285
}
285286

@@ -298,19 +299,24 @@ class WrappedEpoxyModelClickListener<T : EpoxyModel<*>, V> : OnClickListener, On
298299
override fun hasNext() = index < childCount
299300
// ^^^^^^^ definition local 10
300301
// documentation ```kt\npublic open fun hasNext(): [ERROR : Error function type]\n```
302+
// relationship is_reference is_implementation semanticdb maven . . kotlin/collections/Iterator#hasNext().
303+
// relationship is_reference is_implementation semanticdb maven . . kotlin/collections/MutableIterator#hasNext().
301304
// ^^^^^ reference local 7
302305
// ^^^^^ reference local 8
303306
// ^^^^^ reference local 9
304307
override fun next() = getChildAt(index++) ?: throw IndexOutOfBoundsException()
305308
// ^^^^ definition local 11
306309
// documentation ```kt\npublic open fun next(): kotlin.Nothing\n```
310+
// relationship is_reference is_implementation semanticdb maven . . kotlin/collections/Iterator#next().
311+
// relationship is_reference is_implementation semanticdb maven . . kotlin/collections/MutableIterator#next().
307312
// ^^^^^ reference local 7
308313
// ^^^^^ reference local 8
309314
// ^^^^^ reference local 9
310315
// ^^ reference semanticdb maven . . kotlin/Int#inc().
311316
override fun remove() = removeViewAt(--index)
312317
// ^^^^^^ definition local 12
313318
// documentation ```kt\npublic open fun remove(): [ERROR : <ERROR FUNCTION RETURN TYPE>]\n```
319+
// relationship is_reference is_implementation semanticdb maven . . kotlin/collections/MutableIterator#remove().
314320
// ^^ reference semanticdb maven . . kotlin/Int#dec().
315321
// ^^^^^ reference local 7
316322
// ^^^^^ reference local 8
@@ -320,6 +326,7 @@ class WrappedEpoxyModelClickListener<T : EpoxyModel<*>, V> : OnClickListener, On
320326
override fun equals(other: Any?): Boolean {
321327
// ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#equals().
322328
// documentation ```kt\npublic open fun equals(other: kotlin.Any?): kotlin.Boolean\n```
329+
// relationship is_reference is_implementation semanticdb maven . . kotlin/Any#equals().
323330
// ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#equals().(other)
324331
// documentation ```kt\nvalue-parameter other: kotlin.Any?\n```
325332
// ^^^ reference semanticdb maven . . kotlin/Any#
@@ -374,6 +381,7 @@ class WrappedEpoxyModelClickListener<T : EpoxyModel<*>, V> : OnClickListener, On
374381
override fun hashCode(): Int {
375382
// ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#hashCode().
376383
// documentation ```kt\npublic open fun hashCode(): kotlin.Int\n```
384+
// relationship is_reference is_implementation semanticdb maven . . kotlin/Any#hashCode().
377385
// ^^^ reference semanticdb maven . . kotlin/Int#
378386
var result = originalClickListener?.hashCode() ?: 0
379387
// ^^^^^^ definition local 13

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ abstract class EpoxyModelPreloader<T : EpoxyModel<*>, U : ViewMetadata?, P : Pre
333333
override fun buildViewMetadata(view: View) = viewMetadata(view)
334334
// ^^^^^^^^^^^^^^^^^ definition local 3
335335
// documentation ```kt\npublic open fun buildViewMetadata(view: [ERROR : View]): U\n```
336+
// relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#buildViewMetadata().
336337
// ^^^^ definition local 4
337338
// documentation ```kt\nvalue-parameter view: [ERROR : View]\n```
338339
// ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).(viewMetadata)
@@ -341,6 +342,7 @@ abstract class EpoxyModelPreloader<T : EpoxyModel<*>, U : ViewMetadata?, P : Pre
341342
override fun viewSignature(epoxyModel: T) = viewSignature(epoxyModel)
342343
// ^^^^^^^^^^^^^ definition local 5
343344
// documentation ```kt\npublic open fun viewSignature(epoxyModel: T): kotlin.Any?\n```
345+
// relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#viewSignature().
344346
// ^^^^^^^^^^ definition local 6
345347
// documentation ```kt\nvalue-parameter epoxyModel: T\n```
346348
// ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).[T]
@@ -350,6 +352,7 @@ abstract class EpoxyModelPreloader<T : EpoxyModel<*>, U : ViewMetadata?, P : Pre
350352
override fun startPreload(epoxyModel: T, preloadTarget: P, viewData: ViewData<U>) {
351353
// ^^^^^^^^^^^^ definition local 7
352354
// documentation ```kt\npublic open fun startPreload(epoxyModel: T, preloadTarget: P, viewData: com.airbnb.epoxy.preload.ViewData<U>)\n```
355+
// relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#startPreload().
353356
// ^^^^^^^^^^ definition local 8
354357
// documentation ```kt\nvalue-parameter epoxyModel: T\n```
355358
// ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).[T]

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,9 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
755755
class EpoxyPreloadException(errorMessage: String) : RuntimeException(errorMessage)
756756
// ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloadException#
757757
// documentation ```kt\npublic final class EpoxyPreloadException : kotlin.RuntimeException /* = java.lang.RuntimeException */\n```
758+
// relationship is_reference is_implementation semanticdb maven . . kotlin/Throwable#
759+
// relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Exception#
760+
// relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/RuntimeException#
758761
// ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloadException#`<init>`().
759762
// documentation ```kt\npublic constructor EpoxyPreloadException(errorMessage: kotlin.String)\n```
760763
// ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloadException#`<init>`().(errorMessage)
@@ -826,6 +829,7 @@ class ViewData<out U : ViewMetadata?>(
826829
interface ViewMetadata {
827830
// ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#
828831
// documentation ```kt\npublic interface ViewMetadata\n```
832+
// relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/preload/ImageViewMetadata#
829833
companion object {
830834
// ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#Companion# 1:0
831835
// documentation ```kt\npublic companion object\n```
@@ -853,6 +857,7 @@ interface ViewMetadata {
853857
open class ImageViewMetadata(
854858
// ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ImageViewMetadata#
855859
// documentation ```kt\npublic open class ImageViewMetadata : com.airbnb.epoxy.preload.ViewMetadata\n```\n\n----\n\n\n Default implementation of [ViewMetadata] for an ImageView.\n This data can help the preload request know how to configure itself.\n
860+
// relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#
856861
// ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ImageViewMetadata#`<init>`().
857862
// documentation ```kt\npublic constructor ImageViewMetadata(scaleType: [ERROR : ImageView.ScaleType])\n```
858863
val scaleType: ImageView.ScaleType

0 commit comments

Comments
 (0)