Defer supporting IntelliJ 2024.2 to another commit

amazon-ion · Sep 17, 2024 · 451e4cc · 451e4cc
1 parent e7cce76
commit 451e4cc
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 179 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        product: [ "IC-2022.2", "IC-2023.1", "IC-2023.2", "IC-2023.3", "IC-2024.1", "2024.2" ]
+        product: [ "IC-2022.2", "IC-2023.1", "IC-2023.2", "IC-2023.3", "IC-2024.1" ]
       max-parallel: 5
     env:
       PRODUCT_NAME: ${{ matrix.product }}

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        product: [ "IC-2022.2", "IC-2023.1", "IC-2023.2", "IC-2023.3", "IC-2024.1", "IC-2024.2" ]
+        product: [ "IC-2022.2", "IC-2023.1", "IC-2023.2", "IC-2023.3", "IC-2024.1" ]
       max-parallel: 5
     env:
       PRODUCT_NAME: ${{ matrix.product }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
   release:
     strategy:
       matrix:
-        product: [ "IC-2022.2", "IC-2023.1", "IC-2023.2", "IC-2023.3", "IC-2024.1", "IC-2024.2" ]
+        product: [ "IC-2022.2", "IC-2023.1", "IC-2023.2", "IC-2023.3", "IC-2024.1" ]
       max-parallel: 1
     env:
       PRODUCT_NAME: ${{ matrix.product }}

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -80,21 +80,10 @@ val plugins = listOf(
             apiVersion = "1.6"
         ),
         bundledDependencies = listOf("com.intellij.java", "org.jetbrains.kotlin")
-    ),
-    PluginDescriptor(
-        since = "242",
-        until = "242.*",
-        platformVersion = "2024.2",
-        platformType = PlatformType.IdeaCommunity,
-        sourceFolder = "IC-242",
-        kotlin = KotlinOptions(
-            apiVersion = "1.6"
-        ),
-        bundledDependencies = listOf("com.intellij.java", "org.jetbrains.kotlin")
     )
 )
 
-val defaultProductName = "2024.2"
+val defaultProductName = "2024.1"
 val productName = System.getenv("PRODUCT_NAME") ?: defaultProductName
 val maybeGithubRunNumber = System.getenv("GITHUB_RUN_NUMBER")?.toInt()
 val descriptor = plugins.first { it.platformVersion == productName }

diff --git a/src/IC-242/kotlin/com/amazon/ion/plugin/intellij/formatting/ASTNodeUtils.kt b/src/IC-242/kotlin/com/amazon/ion/plugin/intellij/formatting/ASTNodeUtils.kt
diff --git a/src/IC-242/kotlin/com/amazon/ion/plugin/intellij/formatting/IonCodeStyleSettingsProvider.kt b/src/IC-242/kotlin/com/amazon/ion/plugin/intellij/formatting/IonCodeStyleSettingsProvider.kt
diff --git a/src/IC-242/kotlin/com/amazon/ion/plugin/intellij/formatting/IonFormattingModelBuilder.kt b/src/IC-242/kotlin/com/amazon/ion/plugin/intellij/formatting/IonFormattingModelBuilder.kt
diff --git a/src/IC-242/kotlin/com/amazon/ion/plugin/intellij/formatting/blocks/IonSExpressionBlock.kt b/src/IC-242/kotlin/com/amazon/ion/plugin/intellij/formatting/blocks/IonSExpressionBlock.kt
diff --git a/src/IC-242/kotlin/com/amazon/ion/plugin/intellij/psi/PsiElementExtensions.kt b/src/IC-242/kotlin/com/amazon/ion/plugin/intellij/psi/PsiElementExtensions.kt