Merge branch 'master' of https://github.com/EmmyLua/IntelliJ-EmmyLua

EmmyLua · Nov 20, 2023 · b8167e7 · b8167e7
2 parents 0ce7e54 + 9361b5c
commit b8167e7
Show file tree

Hide file tree

Showing 165 changed files with 1,466 additions and 2,066 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,9 +2,10 @@ name: Build Plugin
 
 on:
   push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
+    branches:
+      - '*'
+#  pull_request:
+#    branches: [ "master" ]
 
 permissions:
   contents: read
@@ -16,20 +17,22 @@ jobs:
 
     env:
       CI: true
-      CI_BUILD_VERSION: 1.3.7.${{ github.run_number }}
+      CI_BUILD_VERSION: 1.4.0.${{ github.run_number }}
 
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
 
-      - name: Build 2022.2
-        run: ./gradlew buildPlugin -DIDEA_VER=222
+      - name: Build 2023.1
+        env:
+          IDEA_VER: 231
+        run: ./gradlew buildPlugin
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3.1.0

diff --git a/.github/workflows/on_release.yml b/.github/workflows/on_release.yml
@@ -33,15 +33,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
 
-      - name: Publish 2022.2
+      - name: Publish 2023.1
         env:
-          IDEA_VER: 222
+          IDEA_VER: 231
         run: ./gradlew publishPlugin
 
       - name: Upload artifact

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,9 +19,9 @@ import org.apache.tools.ant.taskdefs.condition.Os
 import java.io.ByteArrayOutputStream
 
 plugins {
-    id("org.jetbrains.intellij").version("1.5.3")
-    id("org.jetbrains.kotlin.jvm").version("1.6.0")
-    id("de.undercouch.download").version("3.4.3")
+    id("org.jetbrains.intellij").version("1.13.3")
+    id("org.jetbrains.kotlin.jvm").version("1.8.21")
+    id("de.undercouch.download").version("5.3.0")
 }
 
 data class BuildData(
@@ -40,6 +40,26 @@ data class BuildData(
 )
 
 val buildDataList = listOf(
+    BuildData(
+        ideaSDKShortVersion = "231",
+        // 223.7571.123-EAP-SNAPSHOT
+        // LATEST-EAP-SNAPSHOT
+        ideaSDKVersion = "233.11799.6-EAP-SNAPSHOT",
+        sinceBuild = "232",
+        untilBuild = "233.*",
+        bunch = "212",
+        targetCompatibilityLevel = JavaVersion.VERSION_17,
+        jvmTarget = "17"
+    ),
+    BuildData(
+        ideaSDKShortVersion = "223",
+        ideaSDKVersion = "2022.3",
+        sinceBuild = "223",
+        untilBuild = "223.*",
+        bunch = "212",
+        targetCompatibilityLevel = JavaVersion.VERSION_17,
+        jvmTarget = "17"
+    ),
     BuildData(
         ideaSDKShortVersion = "222",
         ideaSDKVersion = "2022.2",
@@ -53,71 +73,14 @@ val buildDataList = listOf(
         sinceBuild = "211",
         untilBuild = "211.*",
         bunch = "203"
-    ),
-    BuildData(
-        ideaSDKShortVersion = "203",
-        ideaSDKVersion = "IC-203.5981.155",
-        sinceBuild = "203",
-        untilBuild = "203.*"
-    ),
-    BuildData(
-        ideaSDKShortVersion = "202",
-        ideaSDKVersion = "IC-202.6397.94",
-        sinceBuild = "202",
-        untilBuild = "202.*",
-        jvmTarget = "1.6",
-        targetCompatibilityLevel = JavaVersion.VERSION_1_8
-    ),
-    BuildData(
-        ideaSDKShortVersion = "201",
-        ideaSDKVersion = "IC-201.8743.12",
-        sinceBuild = "201",
-        untilBuild = "201.*",
-        jvmTarget = "1.6",
-        targetCompatibilityLevel = JavaVersion.VERSION_1_8
-    ),
-    BuildData(
-        ideaSDKShortVersion = "193",
-        ideaSDKVersion = "IC-193.5233.102",
-        sinceBuild = "193",
-        untilBuild = "194.*",
-        jvmTarget = "1.6",
-        targetCompatibilityLevel = JavaVersion.VERSION_1_8
-    ),
-    BuildData(
-        ideaSDKShortVersion = "182",
-        ideaSDKVersion = "IC-182.2371.4",
-        sinceBuild = "182",
-        untilBuild = "193.*",
-        explicitJavaDependency = false,
-        jvmTarget = "1.6",
-        targetCompatibilityLevel = JavaVersion.VERSION_1_8
-    ),
-    BuildData(
-        ideaSDKShortVersion = "172",
-        ideaSDKVersion = "IC-172.4574.19",
-        sinceBuild = "172",
-        untilBuild = "181.*",
-        explicitJavaDependency = false,
-        jvmTarget = "1.6",
-        targetCompatibilityLevel = JavaVersion.VERSION_1_8
-    ),
-    BuildData(
-        ideaSDKShortVersion = "171",
-        ideaSDKVersion = "IC-171.4694.73",
-        sinceBuild = "171",
-        untilBuild = "171.*",
-        explicitJavaDependency = false,
-        jvmTarget = "1.6",
-        targetCompatibilityLevel = JavaVersion.VERSION_1_8
     )
 )
 
 val buildVersion = System.getProperty("IDEA_VER") ?: buildDataList.first().ideaSDKShortVersion
 
 val buildVersionData = buildDataList.find { it.ideaSDKShortVersion == buildVersion }!!
 
-val emmyDebuggerVersion = "1.2.9"
+val emmyDebuggerVersion = "1.3.0"
 
 val resDir = "src/main/resources"
 
@@ -211,7 +174,6 @@ project(":") {
     repositories {
         maven(url = "https://www.jetbrains.com/intellij-repository/releases")
         mavenCentral()
-        jcenter()
     }
 
     dependencies {
@@ -231,17 +193,17 @@ project(":") {
         }
     }
 
-    configure<JavaPluginConvention> {
+    /*configure<JavaPluginConvention> {
         sourceCompatibility = buildVersionData.targetCompatibilityLevel
         targetCompatibility = buildVersionData.targetCompatibilityLevel
-    }
+    }*/
 
     intellij {
-        type.set("IU")
+        type.set("IC")
         updateSinceUntilBuild.set(false)
-        downloadSources.set(false)
+        downloadSources.set(!isCI)
         version.set(buildVersionData.ideaSDKVersion)
-        localPath.set(System.getenv("IDEA_HOME_${buildVersionData.ideaSDKShortVersion}"))
+        //localPath.set(System.getenv("IDEA_HOME_${buildVersionData.ideaSDKShortVersion}"))
         sandboxDir.set("${project.buildDir}/${buildVersionData.ideaSDKShortVersion}/idea-sandbox")
     }
 
@@ -312,4 +274,4 @@ project(":") {
             }
         }
     }
-}
+}