Merge pull request #212 from dinbtechit/chores/compatibilty-issues

Resolving Compatibility issues and PR merges
dinbtechit · Dec 11, 2024 · 9cb9848 · 9cb9848
2 parents 5009de8 + 5ffebf9
commit 9cb9848
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -82,7 +82,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 17
+          java-version: 21
 
       # Setup Gradle
       - name: Setup Gradle
@@ -144,7 +144,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 17
+          java-version: 21
 
       # Setup Gradle
       - name: Setup Gradle
@@ -198,7 +198,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 17
+          java-version: 21
 
       # Run Qodana inspections
       - name: Qodana - Code Inspection
@@ -229,7 +229,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 17
+          java-version: 21
 
       # Setup Gradle
       - name: Setup Gradle

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 17
+          java-version: 21
 
       # Setup Gradle
       - name: Setup Gradle

diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 17
+          java-version: 21
 
       # Setup Gradle
       - name: Setup Gradle

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,12 +3,15 @@
 # vscode-theme Changelog
 
 ## Unreleased
+
 ### Added
 - Support k2 compiler
+
 ### Changed
 - Removing Deprecated APIs
 - Min intellj Platform SDK is now 242
 - JDK version to 21
+- #210 - Categorize async Python keyword as a primary keyword (Thanks @j-d-ha) 
 
 ## 1.10.13 - 2024-11-23
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -132,6 +132,12 @@ tasks {
         gradleVersion = providers.gradleProperty("gradleVersion").get()
     }
 
+    patchPluginXml {
+        provider {
+            null
+        }
+    }
+
     publishPlugin {
         dependsOn(patchChangelog)
     }

diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ pluginVersion = 1.11.0
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 242
-pluginUntilBuild = 243.*
+pluginUntilBuild =
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType = IU

diff --git a/src/main/resources/META-INF/lang-config/dinbtechit-kotlin.xml b/src/main/resources/META-INF/lang-config/dinbtechit-kotlin.xml
@@ -4,7 +4,4 @@
                    implementationClass="com.github.dinbtechit.vscodetheme.annotators.KotlinAnnotator"/>
         <colorSettingsPage order="last" implementation="com.github.dinbtechit.vscodetheme.annotators.settings.KtColorSettingsPage"/>
     </extensions>
-    <extensions defaultExtensionNs="org.jetbrains.kotlin">
-        <supportsKotlinPluginMode supportsK2="true"/>
-    </extensions>
 </idea-plugin>
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -20,6 +20,9 @@
     <depends config-file="lang-config/dinbtechit-rust.xml" optional="true">com.jetbrains.rust</depends>
     <depends config-file="lang-config/dinbtechit-sh.xml" optional="true">com.jetbrains.sh</depends>
     <!--<depends config-file="lang-config/dinbtechit-typescript.xml" optional="true">JavaScript</depends>-->
+    <extensions defaultExtensionNs="org.jetbrains.kotlin">
+        <supportsKotlinPluginMode supportsK2="true"/>
+    </extensions>
     <extensions defaultExtensionNs="com.intellij">
         <themeProvider order="first" id="dinbtechit-2179230b863b9b1d9f1eeb27ca4a3a70" path="themes/vscode_dark_modern.theme.json"/>
         <themeProvider order="last" id="dinbtechit-7ef0c378d737e162955f3e028dcf9ccb" path="themes/vscode_dark.theme.json"/>