Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies and compatibility #117

Merged
merged 39 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
17d1369
Bump org.jetbrains.kotlinx.kover from 0.7.2 to 0.7.3
dependabot[bot] Jul 27, 2023
cf3882e
Merge pull request #97 from l0drex/dependabot/gradle/beta/org.jetbrai…
l0drex Jul 28, 2023
d5a34cb
Changelog update - v0.3.5
actions-user Jul 27, 2023
06084a1
Merge branch 'main' into beta
l0drex Aug 8, 2023
436c670
Update to template version 1.11.0
l0drex Aug 8, 2023
f91583f
Bump org.gradle.toolchains.foojay-resolver-convention
dependabot[bot] Aug 17, 2023
97b89e4
Bump org.jetbrains.kotlin.jvm from 1.9.0 to 1.9.10
dependabot[bot] Aug 23, 2023
9a1e98e
Merge pull request #99 from l0drex/dependabot/gradle/beta/org.jetbrai…
l0drex Aug 24, 2023
0e66bac
Bump org.jetbrains.changelog from 2.1.2 to 2.2.0
dependabot[bot] Aug 28, 2023
a9c7f68
Merge pull request #100 from l0drex/dependabot/gradle/beta/org.jetbra…
l0drex Aug 29, 2023
6063559
Bump actions/checkout from 3 to 4
dependabot[bot] Sep 4, 2023
ffbe5a8
Bump JetBrains/qodana-action from 2023.2.1 to 2023.2.6
dependabot[bot] Sep 4, 2023
9e765f8
Merge pull request #101 from l0drex/dependabot/github_actions/beta/ac…
l0drex Sep 5, 2023
3a311a6
Merge pull request #102 from l0drex/dependabot/github_actions/beta/Je…
l0drex Sep 5, 2023
b181234
Merge pull request #98 from l0drex/dependabot/gradle/beta/org.gradle.…
l0drex Sep 7, 2023
f601169
Bump codecov/codecov-action from 3 to 4
dependabot[bot] Sep 14, 2023
2348c34
Merge pull request #103 from l0drex/dependabot/github_actions/beta/co…
l0drex Sep 18, 2023
ba0ffcf
Update to template version 1.11.2
l0drex Oct 7, 2023
3e902a6
Bump JetBrains/qodana-action from 2023.2.6 to 2023.2.8
dependabot[bot] Oct 9, 2023
613c855
Merge pull request #105 from l0drex/dependabot/github_actions/beta/Je…
l0drex Oct 10, 2023
d74b3ef
Bump org.jetbrains.kotlinx.kover from 0.7.3 to 0.7.4
dependabot[bot] Oct 10, 2023
f7d52fc
Merge pull request #106 from l0drex/dependabot/gradle/beta/org.jetbra…
l0drex Oct 11, 2023
2d35dbf
Bump org.jetbrains.kotlin.jvm from 1.9.10 to 1.9.20
dependabot[bot] Oct 30, 2023
25604ca
Merge pull request #107 from l0drex/dependabot/gradle/beta/org.jetbra…
l0drex Nov 8, 2023
c4dcc15
Bump org.jetbrains:annotations from 24.0.1 to 24.1.0
dependabot[bot] Nov 15, 2023
e96a548
Merge pull request #109 from l0drex/dependabot/gradle/beta/org.jetbra…
l0drex Nov 16, 2023
e6c1f60
Bump org.jetbrains.kotlin.jvm from 1.9.20 to 1.9.21
dependabot[bot] Nov 23, 2023
45e37c1
Merge pull request #110 from l0drex/dependabot/gradle/beta/org.jetbra…
l0drex Nov 24, 2023
325d055
Bump org.jetbrains.kotlinx.kover from 0.7.4 to 0.7.5
dependabot[bot] Nov 28, 2023
ba7749f
Bump actions/setup-java from 3 to 4
dependabot[bot] Nov 29, 2023
b723f42
Merge pull request #112 from l0drex/dependabot/github_actions/beta/ac…
l0drex Nov 30, 2023
9ae3ec1
Bump org.jetbrains.intellij from 1.16.0 to 1.16.1
dependabot[bot] Dec 1, 2023
ce21a5b
Bump JetBrains/qodana-action from 2023.2.8 to 2023.3.0
dependabot[bot] Dec 11, 2023
a938a40
Merge pull request #115 from l0drex/dependabot/github_actions/beta/Je…
l0drex Dec 12, 2023
f18d956
Bump actions/upload-artifact from 3 to 4
dependabot[bot] Dec 14, 2023
317f26d
Merge pull request #116 from l0drex/dependabot/github_actions/beta/ac…
l0drex Dec 19, 2023
fb1644c
Merge pull request #114 from l0drex/dependabot/gradle/beta/org.jetbra…
l0drex Dec 19, 2023
3b2dadb
Merge pull request #111 from l0drex/dependabot/gradle/beta/org.jetbra…
l0drex Dec 19, 2023
654345d
Update to template version 1.11.3
l0drex Dec 19, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 51 additions & 38 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# GitHub Actions Workflow is created for testing and preparing the plugin release in the following steps:
# - validate Gradle Wrapper,
# - run 'test' and 'verifyPlugin' tasks,
# - run Qodana inspections,
# - run 'buildPlugin' task and prepare artifact for the further tests,
# - run 'runPluginVerifier' task,
# - create a draft release.
# - Validate Gradle Wrapper.
# - Run 'test' and 'verifyPlugin' tasks.
# - Run Qodana inspections.
# - Run the 'buildPlugin' task and prepare artifact for further tests.
# - Run the 'runPluginVerifier' task.
# - Create a draft release.
#
# Workflow is triggered on push and pull_request events.
# The workflow is triggered on push and pull_request events.
#
# GitHub Actions reference: https://help.github.com/en/actions
#
## JBIJPPTPL

name: Build
on:
# Trigger the workflow on pushes to only the 'main' branch (this avoids duplicate checks being run e.g. for dependabot pull requests)
# Trigger the workflow on pushes to only the 'main' branch (this avoids duplicate checks being run e.g., for dependabot pull requests)
push:
branches: [ main ]
# Trigger the workflow on any pull request
Expand All @@ -32,31 +32,26 @@ jobs:
pluginVerifierHomeDir: ${{ steps.properties.outputs.pluginVerifierHomeDir }}
steps:

# Free GitHub Actions Environment Disk Space
- name: Maximize Build Space
run: |
sudo rm -rf /usr/share/dotnet
sudo rm -rf /usr/local/lib/android
sudo rm -rf /opt/ghc

# Check out current repository
- name: Fetch Sources
uses: actions/checkout@v3
uses: actions/checkout@v4

# Validate wrapper
- name: Gradle Wrapper Validation
uses: gradle/wrapper-validation-action@v1.1.0

# Setup Java environment for the next steps
# Set up Java environment for the next steps
- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 17

# Setup Gradle
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
gradle-home-cache-cleanup: true

# Set environment variables
- name: Export Properties
Expand Down Expand Up @@ -93,7 +88,7 @@ jobs:

# Store already-built plugin as an artifact for downloading
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ steps.artifact.outputs.filename }}
path: ./build/distributions/content/*/*
Expand All @@ -107,18 +102,20 @@ jobs:

# Check out current repository
- name: Fetch Sources
uses: actions/checkout@v3
uses: actions/checkout@v4

# Setup Java environment for the next steps
# Set up Java environment for the next steps
- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 17

# Setup Gradle
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
gradle-home-cache-cleanup: true

# Run tests
- name: Run Tests
Expand All @@ -127,16 +124,16 @@ jobs:
# Collect Tests Result of failed tests
- name: Collect Tests Result
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: tests-result
path: ${{ github.workspace }}/build/reports/tests

# Upload Kover report to CodeCov
# Upload the Kover report to CodeCov
- name: Upload Code Coverage Report
uses: codecov/codecov-action@v3
with:
files: ${{ github.workspace }}/build/reports/kover/xml/report.xml
files: ${{ github.workspace }}/build/reports/kover/report.xml

# Run Qodana inspections and provide report
inspectCode:
Expand All @@ -149,44 +146,60 @@ jobs:
pull-requests: write
steps:

# Free GitHub Actions Environment Disk Space
- name: Maximize Build Space
uses: jlumbroso/free-disk-space@main
with:
tool-cache: false
large-packages: false

# Check out current repository
- name: Fetch Sources
uses: actions/checkout@v3
uses: actions/checkout@v4

# Setup Java environment for the next steps
# Set up Java environment for the next steps
- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 17

# Run Qodana inspections
- name: Qodana - Code Inspection
uses: JetBrains/qodana-action@v2023.2.1
uses: JetBrains/qodana-action@v2023.3.0
with:
cache-default-branch-only: true

# Run plugin structure verification along with IntelliJ Plugin Verifier
verify:
name: Verify plugin
needs: [ build, test, inspectCode ]
needs: [ build ]
runs-on: ubuntu-latest
steps:

# Free GitHub Actions Environment Disk Space
- name: Maximize Build Space
uses: jlumbroso/free-disk-space@main
with:
tool-cache: false
large-packages: false

# Check out current repository
- name: Fetch Sources
uses: actions/checkout@v3
uses: actions/checkout@v4

# Setup Java environment for the next steps
# Set up Java environment for the next steps
- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 17

# Setup Gradle
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
gradle-home-cache-cleanup: true

# Cache Plugin Verifier IDEs
- name: Setup Plugin Verifier IDEs Cache
Expand All @@ -202,7 +215,7 @@ jobs:
# Collect Plugin Verifier Result
- name: Collect Plugin Verifier Result
if: ${{ always() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pluginVerifier-result
path: ${{ github.workspace }}/build/reports/pluginVerifier
Expand All @@ -212,19 +225,19 @@ jobs:
releaseDraft:
name: Release draft
if: github.event_name != 'pull_request'
needs: [ build, verify ]
needs: [ build, test, inspectCode, verify ]
runs-on: ubuntu-latest
permissions:
contents: write
steps:

# Check out current repository
- name: Fetch Sources
uses: actions/checkout@v3
uses: actions/checkout@v4

# Setup Java environment for the next steps
# Set up Java environment for the next steps
- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 17
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:

# Prepare and publish the plugin to the Marketplace repository
# Prepare and publish the plugin to JetBrains Marketplace repository
release:
name: Publish Plugin
runs-on: ubuntu-latest
Expand All @@ -20,20 +20,22 @@ jobs:

# Check out current repository
- name: Fetch Sources
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.release.tag_name }}

# Setup Java environment for the next steps
# Set up Java environment for the next steps
- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 17

# Setup Gradle
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
gradle-home-cache-cleanup: true

# Set environment variables
- name: Export Properties
Expand All @@ -57,7 +59,7 @@ jobs:
run: |
./gradlew patchChangelog --release-note="$CHANGELOG"

# Publish the plugin to the Marketplace
# Publish the plugin to JetBrains Marketplace
- name: Publish Plugin
env:
PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
Expand All @@ -72,7 +74,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: gh release upload ${{ github.event.release.tag_name }} ./build/distributions/*

# Create pull request
# Create a pull request
- name: Create Pull Request
if: ${{ steps.properties.outputs.changelog != '' }}
env:
Expand All @@ -91,6 +93,7 @@ jobs:

gh label create "$LABEL" \
--description "Pull requests with release changelog update" \
--force \
|| true

gh pr create \
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/run-ui-tests.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# GitHub Actions Workflow for launching UI tests on Linux, Windows, and Mac in the following steps:
# - prepare and launch IDE with your plugin and robot-server plugin, which is needed to interact with UI
# - wait for IDE to start
# - run UI tests with separate Gradle task
# - Prepare and launch IDE with your plugin and robot-server plugin, which is needed to interact with the UI.
# - Wait for IDE to start.
# - Run UI tests with a separate Gradle task.
#
# Please check https://github.com/JetBrains/intellij-ui-test-robot for information about UI tests with IntelliJ Platform
# Please check https://github.com/JetBrains/intellij-ui-test-robot for information about UI tests with IntelliJ Platform.
#
# Workflow is triggered manually.

Expand Down Expand Up @@ -33,18 +33,20 @@ jobs:

# Check out current repository
- name: Fetch Sources
uses: actions/checkout@v3
uses: actions/checkout@v4

# Setup Java environment for the next steps
# Set up Java environment for the next steps
- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 17

# Setup Gradle
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
gradle-home-cache-cleanup: true

# Run IDEA prepared for UI testing
- name: Run IDE
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# Intellij-KDE-Breeze-Theme Changelog

## [Unreleased]
### Changed
- Updated template to 1.11.0

## [0.3.5] - 2023-07-27

Expand Down
6 changes: 5 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ dependencies {

// Set the JVM language level used to build the project. Use Java 11 for 2020.3+, and Java 17 for 2022.2+.
kotlin {
jvmToolchain(17)
@Suppress("UnstableApiUsage")
jvmToolchain {
languageVersion = JavaLanguageVersion.of(17)
vendor = JvmVendorSpec.JETBRAINS
}
}

// Configure Gradle IntelliJ Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ pluginGroup = com.github.l0drex.intellijkdebreezetheme
pluginName = Intellij-KDE-Breeze-Theme
pluginRepositoryUrl = https://github.com/l0drex/Intellij-KDE-Breeze-Theme
# SemVer format -> https://semver.org
pluginVersion = 0.3.5
pluginVersion = 0.3.6

# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
pluginSinceBuild = 222
pluginUntilBuild = 232.*
pluginSinceBuild = 223
pluginUntilBuild = 233.*

# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
platformType = IC
platformVersion = 2023.2
platformVersion = 2023.3

# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
platformPlugins =

# Gradle Releases -> https://github.com/gradle/gradle/releases
gradleVersion = 8.2.1
gradleVersion = 8.5

# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
kotlin.stdlib.default.dependency = false
Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[versions]
# libraries
annotations = "24.0.1"
annotations = "24.1.0"

# plugins
kotlin = "1.9.0"
changelog = "2.1.2"
gradleIntelliJPlugin = "1.15.0"
kotlin = "1.9.21"
changelog = "2.2.0"
gradleIntelliJPlugin = "1.16.1"
qodana = "0.1.13"
kover = "0.7.2"
kover = "0.7.5"

[libraries]
annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading