From ab7719ab17e6d19c136121a7ea69c8797818fc8a Mon Sep 17 00:00:00 2001
From: Alex Simons <alexsimons9999@gmail.com>
Date: Sun, 25 Sep 2022 17:56:34 -0500
Subject: [PATCH] Added 2022.3 Build Support. (#148)

---
 .github/workflows/pre-merge.yml               | 46 +++++++++++++++----
 .github/workflows/release.yml                 |  2 +-
 build.gradle                                  |  6 +--
 docs/CHANGELOG.md                             |  4 ++
 docs/RELEASE-NOTES.md                         |  2 +-
 gradle.properties                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 .../n7/notification/UpdateComponent.kt        |  2 +-
 8 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml
index 8a29a9e..4817300 100644
--- a/.github/workflows/pre-merge.yml
+++ b/.github/workflows/pre-merge.yml
@@ -13,20 +13,46 @@ jobs:
 
     steps:
     - 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: 'zulu'
     - name: Grant execute permission for scripts
       run: chmod +x gradlew
+
+      # Set environment variables
+    - name: Export Properties
+      id: properties
+      shell: bash
+      run: |
+        PROPERTIES="$(./gradlew properties --console=plain -q)"
+        VERSION="$(echo "$PROPERTIES" | grep "^version:" | cut -f2- -d ' ')"
+        
+        echo "::set-output name=version::$VERSION"
+        echo "::set-output name=pluginVerifierHomeDir::~/.pluginVerifier"
+        
+        ./gradlew listProductsReleases # prepare list of IDEs for Plugin Verifier
+
+
     - name: Perform quality check
       run: ./gradlew clean check buildPlugin
-#      todo: bring back when 2022.2 is available
-#    - uses: ChrisCarini/intellij-platform-plugin-verifier-action@v1.2.1
-#      with:
-#        ide-versions: |
-#          ideaIC:2020.3
-#          ideaIU:2020.3
-#          ideaIC:2022.1.2
-#          ideaIU:2022.1.2
+
+      # Cache Plugin Verifier IDEs
+    - name: Setup Plugin Verifier IDEs Cache
+      uses: actions/cache@v3
+      with:
+        path: ${{ steps.properties.outputs.pluginVerifierHomeDir }}/ides
+        key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
+
+      # Run Verify Plugin task and IntelliJ Plugin Verifier tool
+    - name: Run Plugin Verification tasks
+      run: ./gradlew runPluginVerifier -Pplugin.verifier.home.dir=${{ steps.properties.outputs.pluginVerifierHomeDir }}
+
+      # Collect Plugin Verifier Result
+    - name: Collect Plugin Verifier Result
+      if: ${{ always() }}
+      uses: actions/upload-artifact@v3
+      with:
+        name: pluginVerifier-result
+        path: ${{ github.workspace }}/build/reports/pluginVerifier
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4605d67..83acfe8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
       - run: ./ciScripts/buildPlugin.sh
       - name: Copy zip file
diff --git a/build.gradle b/build.gradle
index a0e404a..31a6538 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ repositories {
 }
 
 group 'io.unthrottled'
-version '1.10.0'
+version '1.11.0'
 
 dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
@@ -36,10 +36,10 @@ intellij {
 }
 
 compileKotlin {
-  kotlinOptions.jvmTarget = "11"
+  kotlinOptions.jvmTarget = "17"
 }
 compileTestKotlin {
-  kotlinOptions.jvmTarget = "11"
+  kotlinOptions.jvmTarget = "17"
 }
 
 markdownToHtml {
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 126203c..44e2151 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 ---- 
 
+# 1.11.0 [2022.3 Support]
+
+- Added 2022.3 Build Support
+
 # 1.10.0 [EAP Support]
 
 - Plugin only supports 2022.2 builds or greater now.
diff --git a/docs/RELEASE-NOTES.md b/docs/RELEASE-NOTES.md
index fa192f7..ded6b05 100644
--- a/docs/RELEASE-NOTES.md
+++ b/docs/RELEASE-NOTES.md
@@ -1,3 +1,3 @@
-- Plugin only supports 2022.2 builds or greater now.
+- Added 2022.3 Build Support
 
 Please see the <a href="https://github.com/Unthrottled/normandy-progress-bar/blob/master/docs/CHANGELOG.md">Changelog</a> for more information.
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index e1a850a..53ff56e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@
 idePath=
 
 sinceBuildP=222.2889.14
-untilBuildP=222.*
+untilBuildP=223.*
 
 intellijPublishUsername=alexsimons999
 intellijPublishPassword=
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d913..ae04661 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/io/unthrottled/n7/notification/UpdateComponent.kt b/src/main/kotlin/io/unthrottled/n7/notification/UpdateComponent.kt
index 05c851d..8cb1e31 100644
--- a/src/main/kotlin/io/unthrottled/n7/notification/UpdateComponent.kt
+++ b/src/main/kotlin/io/unthrottled/n7/notification/UpdateComponent.kt
@@ -17,7 +17,7 @@ val UPDATE_MESSAGE =
   """
       What's New?<br>
       <ul>
-        <li>Only supporting +2022.2 builds now.</li>
+        <li>Added support for 2022.3 Builds.</li>
       </ul>
       <br>
       <br>Please see the <a href="https://github.com/Unthrottled/normandy-progress-bar/blob/master/docs/CHANGELOG.md">Changelog</a> for more details.