From 1fc01606ec360944870b59042d05c48b3098210b Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igfoo@github.com>
Date: Wed, 21 Aug 2024 15:53:02 +0100
Subject: [PATCH] KE2: More steps towards something working

---
 java/kotlin-extractor2/BUILD.bazel                     |  6 ++++--
 .../src/main/kotlin/KotlinExtractor.kt                 | 10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/java/kotlin-extractor2/BUILD.bazel b/java/kotlin-extractor2/BUILD.bazel
index 62eb22e9fb0..3d1a7c8ae94 100644
--- a/java/kotlin-extractor2/BUILD.bazel
+++ b/java/kotlin-extractor2/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@rules_kotlin//kotlin:core.bzl", "kt_javac_options", "kt_kotlinc_options")
-load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_binary")
 
 kt_javac_options(
     name = "javac-options",
@@ -8,6 +8,7 @@ kt_javac_options(
 
 kt_kotlinc_options(
     name = "kotlinc-options",
+    # x_context_receivers = True
     # if needed, see https://bazelbuild.github.io/rules_kotlin/kotlin.html#kt_kotlinc_options for available options
 )
 
@@ -24,8 +25,9 @@ kt_kotlinc_options(
 #    tools = [":generate_dbscheme"],
 #)
 
-kt_jvm_library(
+kt_jvm_binary(
     name = "kotlin-extractor2",
+    main_class = "KotlinExtractorKt",
     srcs = [
         #        ":generated-dbscheme",
         "src/main/kotlin/KotlinExtractor.kt",
diff --git a/java/kotlin-extractor2/src/main/kotlin/KotlinExtractor.kt b/java/kotlin-extractor2/src/main/kotlin/KotlinExtractor.kt
index 810572bb2c6..679bf6b0f51 100644
--- a/java/kotlin-extractor2/src/main/kotlin/KotlinExtractor.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/KotlinExtractor.kt
@@ -1,16 +1,16 @@
 import com.intellij.openapi.editor.Document
 import com.intellij.psi.PsiFile
 import java.nio.file.Paths
-import org.jetbrains.kotlin.analysis.api.KtAnalysisApiInternals
-import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
+import org.jetbrains.kotlin.analysis.api.KaAnalysisApiInternals
+import org.jetbrains.kotlin.analysis.api.KaSession
 import org.jetbrains.kotlin.analysis.api.analyze
-// import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeTokenProvider
+import org.jetbrains.kotlin.analysis.api.platform.lifetime.KotlinAlwaysAccessibleLifetimeTokenProvider
+import org.jetbrains.kotlin.analysis.api.platform.lifetime.KotlinLifetimeTokenProvider
+import org.jetbrains.kotlin.analysis.api.projectStructure.KaSourceModule
 import org.jetbrains.kotlin.analysis.api.standalone.buildStandaloneAnalysisAPISession
-// import org.jetbrains.kotlin.analysis.api.standalone.KtAlwaysAccessibleLifetimeTokenProvider
 import org.jetbrains.kotlin.analysis.project.structure.builder.buildKtLibraryModule
 import org.jetbrains.kotlin.analysis.project.structure.builder.buildKtSdkModule
 import org.jetbrains.kotlin.analysis.project.structure.builder.buildKtSourceModule
-import org.jetbrains.kotlin.analysis.project.structure.KtSourceModule
 import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
 import org.jetbrains.kotlin.psi.*