From 21a1a3eb174af66c59bf052125b69ff13a3849a5 Mon Sep 17 00:00:00 2001 From: Jonathan Gafner Date: Thu, 8 Jun 2023 09:12:10 +0300 Subject: [PATCH 1/3] Template alignment --- .github/workflows/build.yml | 3 +- .github/workflows/release.yml | 1 + .github/workflows/run-ui-tests.yml | 1 + CHANGELOG.md | 46 ++++++++++++++++++++++++ build.gradle.kts | 8 +++-- gradle.properties | 6 ++-- gradle/libs.versions.toml | 8 ++--- gradle/wrapper/gradle-wrapper.properties | 2 +- qodana.yml | 1 + 9 files changed, 65 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d0e2edd..16d8266 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,6 +56,7 @@ jobs: with: distribution: 'zulu' java-version: '17' + cache: gradle # Set environment variables - name: Export Properties @@ -116,7 +117,7 @@ jobs: # Run Qodana inspections - name: Qodana - Code Inspection - uses: JetBrains/qodana-action@v2022.3.4 + uses: JetBrains/qodana-action@v2023.1.0 # Prepare plugin archive content for creating artifact - name: Prepare Plugin Artifact diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 345cf7f..c85ad65 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,6 +30,7 @@ jobs: with: distribution: zulu java-version: 17 + cache: gradle # Set environment variables - name: Export Properties diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml index 45a08f2..e1de610 100644 --- a/.github/workflows/run-ui-tests.yml +++ b/.github/workflows/run-ui-tests.yml @@ -41,6 +41,7 @@ jobs: with: distribution: zulu java-version: 17 + cache: gradle # Run IDEA prepared for UI testing - name: Run IDE diff --git a/CHANGELOG.md b/CHANGELOG.md index 3018d4b..1642909 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,22 +2,45 @@ ## [Unreleased] +### Added + +- GitHub Actions - enable caching +- Specify `projectJDK: 17` in `qodana.yml` +- Specify `linter` property in `qodana.yml` + +### Changed + +- Use Java `17` for JVM Toolchain +- Change since/until build to `231.*-232.*` (2031.* - 2023.2.*) +- Dependencies - upgrade `org.jetbrains.intellij` to `1.14.1` +- Dependencies - upgrade `org.jetbrains.changelog` to `2.1.0` +- Dependencies - upgrade `org.jetbrains.kotlin.jvm` to `1.8.21` +- Dependencies - upgrade `org.jetbrains.kotlinx.kover` to `0.7.1` +- Dependencies (GitHub Actions) - upgrade `JetBrains/qodana-action` to `v2023.1.0` +- Upgrade Gradle Wrapper to `8.1.1` +- GitHub Actions — switch to Java 17 +- Adjust Kover configuration + ## [1.0.37] - 2023-05-17 ### Changed + - Vendor Name in plugin's marketplace page ## [1.0.36] - 2023-05-16 + - Fix the issue with the persistent web favorites - Transferred the project to the new organization ## [1.0.32] - 2023-05-14 + - Support to override user agent string - Changelog update - `v1.0.31` by @github-actions in https://github.com/Jonatha1983/GIdeaBrowser/pull/62 - Add the option to set headers by @Majed6 in https://github.com/Jonatha1983/GIdeaBrowser/pull/64 - @Majed6 made their first contribution in https://github.com/Jonatha1983/GIdeaBrowser/pull/64 ## [1.0.31] - 2023-04-19 + - Support for IC-231 version - Support for IC-223 version - Support for IC-222 version @@ -25,15 +48,18 @@ ## [1.0.24] ### Added + - Add Zoom In & Out actions - Add Find Action - Initial work to support cookies manager in the browser ### Changed + - Set Devtools enable by default - Toolwindow is now at left side by default ### Fixed + - Fix the issue with the devtools - Fix the issue with adding to favorites - Fix the change log job to be run as part of the release process @@ -43,16 +69,19 @@ ## [1.0.21] ### Added + - Support for Open in Browser ## [1.0.15] ### Added + - Support for IJ2021.3 ## [1.0.14] ### Added + - Fix url text - Add bookmarks with right click - Fix devtool @@ -60,6 +89,7 @@ ## [1.0.13] ### Added + - Fix url text - Add bookmarks with right click - Fix devtool @@ -67,6 +97,7 @@ ## [1.0.12] ### Added + - Back ,Forward, Refresh and home Buttons - Default Home Page in Settings - Url Text field with history @@ -76,25 +107,40 @@ ## [1.0.7] ### Added + - Back ,Forward and Refresh Buttons - Default Home Page in Settings - Support IJ 211 ## [1.0.3] + -- First Jetbrains Public -- First Jetbrains Public [Unreleased]: https://github.com/edgafner/GIdeaBrowser/compare/v1.0.37...HEAD + [1.0.37]: https://github.com/edgafner/GIdeaBrowser/compare/v1.0.36...v1.0.37 + [1.0.36]: https://github.com/edgafner/GIdeaBrowser/compare/v1.0.32...v1.0.36 + [1.0.32]: https://github.com/Jonatha1983/GIdeaBrowser/compare/v1.0.31...v1.0.32 + [1.0.31]: https://github.com/Jonatha1983/GIdeaBrowser/compare/v1.0.24...v1.0.31 + [1.0.24]: https://github.com/Jonatha1983/GIdeaBrowser/compare/v1.0.23...v1.0.24 + [1.0.23]: https://github.com/Jonatha1983/GIdeaBrowser/compare/v1.0.21...v1.0.23 + [1.0.21]: https://github.com/Jonatha1983/GIdeaBrowser/compare/v1.0.15...v1.0.21 + [1.0.15]: https://github.com/Jonatha1983/GIdeaBrowser/compare/v1.0.14...v1.0.15 + [1.0.14]: https://github.com/Jonatha1983/GIdeaBrowser/compare/v1.0.13...v1.0.14 + [1.0.13]: https://github.com/Jonatha1983/GIdeaBrowser/compare/v1.0.12...v1.0.13 + [1.0.12]: https://github.com/Jonatha1983/GIdeaBrowser/compare/v1.0.7...v1.0.12 + [1.0.7]: https://github.com/Jonatha1983/GIdeaBrowser/compare/v1.0.3...v1.0.7 + [1.0.3]: https://github.com/Jonatha1983/GIdeaBrowser/commits/v1.0.3 diff --git a/build.gradle.kts b/build.gradle.kts index 422d114..75a3cc2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -60,8 +60,12 @@ qodana { // Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration -kover.xmlReport { - onCheck = true +koverReport { + defaults { + xml { + onCheck = true + } + } } diff --git a/gradle.properties b/gradle.properties index 053bf94..49dc65b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,18 +4,18 @@ pluginGroup=com.github.jonatha1983.gib pluginName=GIdeaBrowser pluginRepositoryUrl=https://github.com/edgafner/GIdeaBrowser -pluginVersion=1.0.37 +pluginVersion=1.0.38 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html # for insight into build numbers and IntelliJ Platform versions. pluginSinceBuild=231 -pluginUntilBuild=231.* +pluginUntilBuild=232.* platformType=IC platformVersion=2023.1 # Plugin Dependencies -> https://www.jetbrains.org/intellij/sdk/docs/basics/plugin_structure/plugin_dependencies.html # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 platformPlugins=com.intellij.java # Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3 -gradleVersion=8.1 +gradleVersion=8.1.1 # Opt-out flag for bundling Kotlin standard library. # See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details. # suppress inspection "UnusedProperty" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9f0c33b..cbf96eb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,11 +4,11 @@ annotations = "24.0.1" # plugins dokka = "1.8.10" -kotlin = "1.8.20" -changelog = "2.0.0" -gradleIntelliJPlugin = "1.13.3" +kotlin = "1.8.21" +changelog = "2.1.0" +gradleIntelliJPlugin = "1.14.1" qodana = "0.1.13" -kover = "0.6.1" +kover = "0.7.1" [libraries] annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c85a1f..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/qodana.yml b/qodana.yml index 8df94a5..f388de9 100644 --- a/qodana.yml +++ b/qodana.yml @@ -2,6 +2,7 @@ # https://www.jetbrains.com/help/qodana/qodana-yaml.html version: 1.0 +linter: jetbrains/qodana-jvm-community:latest projectJDK: 17 profile: name: qodana.recommended From 7e6b83a98cb3ddd8192a86b26a24823e64c88a57 Mon Sep 17 00:00:00 2001 From: Jonathan Gafner Date: Thu, 8 Jun 2023 10:43:31 +0300 Subject: [PATCH 2/3] Test PR new file --- a.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 a.txt diff --git a/a.txt b/a.txt new file mode 100644 index 0000000..30d74d2 --- /dev/null +++ b/a.txt @@ -0,0 +1 @@ +test \ No newline at end of file From 460e6493555ce0c39e6ba92003d6d346b1fb11ad Mon Sep 17 00:00:00 2001 From: Jonathan Gafner Date: Thu, 8 Jun 2023 10:44:18 +0300 Subject: [PATCH 3/3] Test PR revert new file --- a.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 a.txt diff --git a/a.txt b/a.txt deleted file mode 100644 index 30d74d2..0000000 --- a/a.txt +++ /dev/null @@ -1 +0,0 @@ -test \ No newline at end of file