Skip to content

Commit

Permalink
Merge branch 'release/1.0.20'
Browse files Browse the repository at this point in the history
  • Loading branch information
nekofar committed Dec 12, 2023
2 parents 6f55552 + 2a621f4 commit d24a93d
Show file tree
Hide file tree
Showing 15 changed files with 139 additions and 79 deletions.
56 changes: 40 additions & 16 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,56 @@ assignees:
- nekofar

body:

- type: textarea
id: issue
attributes:
label: Describe the bug
label: What happened?
description: A clear and concise description of what the bug is.
placeholder: Describe the bug here.
validations:
required: true

- type: textarea
id: logs
attributes:
label: Steps to reproduce the behavior
description: List the steps to reproduce the behavior, including any necessary environment details.
placeholder: List the steps to reproduce here.
label: Relevant log output or stack trace
description: |
Please copy and paste any relevant log output.
Add the full stack trace if available.
If possible, run the failing task with `--stacktrace` flag.
*This will be automatically formatted into code, so there is no need for backticks.*
render: shell

- type: textarea
id: steps
attributes:
label: Expected behavior
description: A clear and concise description of what you expected to happen.
placeholder: Describe the expected behavior here.
label: Steps to reproduce
description: Steps to reproduce the behavior – provide your build configuration.
validations:
required: true

- type: textarea
- type: input
id: version
attributes:
label: Screenshots
description: If applicable, add screenshots to help explain the problem.
placeholder: Add any relevant screenshots here.
label: Plugin version
placeholder: 1.0.0
validations:
required: true

- type: textarea
- type: input
id: gradle
attributes:
label: Gradle version
placeholder: 8.2.1
validations:
required: true

- type: dropdown
id: os
attributes:
label: Additional context
description: Add any other context about the problem here.
placeholder: Add any additional context here.
label: Operating System
options:
- macOS
- Linux
- Windows
23 changes: 14 additions & 9 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,31 @@ assignees:
- nekofar

body:

- type: textarea
id: cause
attributes:
label: Is your feature request related to a problem? Please describe.
description: A clear and concise description of what the problem is. Ex. I'm always frustrated when ...
placeholder: Describe the problem here.
label: Describe the need of your request
description: A clear and concise description of what the need or problem is.
validations:
required: true

- type: textarea
id: solution
attributes:
label: Describe the solution you'd like
label: Proposed solution
description: A clear and concise description of what you want to happen.
placeholder: Describe the solution you'd like here.
validations:
required: true

- type: textarea
id: alternatives
attributes:
label: Describe alternatives you've considered
description: A clear and concise description of any alternative solutions or features you've considered.
placeholder: Describe alternatives here.
label: Alternatives you've considered
description: What did you try so far to accomplish the goal?

- type: textarea
id: context
attributes:
label: Additional context
description: Add any other context or screenshots about the feature request here.
placeholder: Add any additional context or screenshots here.
68 changes: 37 additions & 31 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# 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

Expand Down Expand Up @@ -49,13 +49,6 @@ 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/[email protected]
Expand All @@ -64,7 +57,7 @@ jobs:
- name: Gradle Wrapper Validation
uses: gradle/[email protected]

# Setup Java environment for the next steps
# Set up Java environment for the next steps
- name: Setup Java
uses: actions/[email protected]
with:
Expand All @@ -73,7 +66,9 @@ jobs:

# Setup Gradle
- name: Setup Gradle
uses: gradle/[email protected]
uses: gradle/[email protected]
with:
gradle-home-cache-cleanup: true

# Set environment variables
- name: Export Properties
Expand Down Expand Up @@ -138,7 +133,7 @@ jobs:
- name: Fetch Sources
uses: actions/[email protected]

# Setup Java environment for the next steps
# Set up Java environment for the next steps
- name: Setup Java
uses: actions/[email protected]
with:
Expand All @@ -147,7 +142,9 @@ jobs:

# Setup Gradle
- name: Setup Gradle
uses: gradle/[email protected]
uses: gradle/[email protected]
with:
gradle-home-cache-cleanup: true

# Run tests
- name: Run Tests
Expand All @@ -161,11 +158,11 @@ jobs:
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/[email protected]
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 @@ -178,11 +175,18 @@ jobs:
pull-requests: write
steps:

# Free GitHub Actions Environment Disk Space
- name: Maximize Build Space
uses: jlumbroso/[email protected]
with:
tool-cache: false
large-packages: false

# Check out current repository
- name: Fetch Sources
uses: actions/[email protected]

# Setup Java environment for the next steps
# Set up Java environment for the next steps
- name: Setup Java
uses: actions/[email protected]
with:
Expand All @@ -198,20 +202,22 @@ jobs:
# Run plugin structure verification along with IntelliJ Plugin Verifier
verify:
name: Verify plugin
needs: [ build, test, inspectCode ]
needs: [ build ]
runs-on: ubuntu-latest
steps:
# Remove files to save space
- name: Remove unnecessary files
run: |
sudo rm -rf /usr/share/dotnet
sudo rm -rf "$AGENT_TOOLSDIRECTORY"

# Free GitHub Actions Environment Disk Space
- name: Maximize Build Space
uses: jlumbroso/[email protected]
with:
tool-cache: false
large-packages: false

# Check out current repository
- name: Fetch Sources
uses: actions/[email protected]

# Setup Java environment for the next steps
# Set up Java environment for the next steps
- name: Setup Java
uses: actions/[email protected]
with:
Expand All @@ -220,7 +226,7 @@ jobs:

# Setup Gradle
- name: Setup Gradle
uses: gradle/gradle-build-action@v2.10.0
uses: gradle/gradle-build-action@v2.11.0

# Cache Plugin Verifier IDEs
- name: Setup Plugin Verifier IDEs Cache
Expand All @@ -246,7 +252,7 @@ jobs:
releaseDraft:
name: Release draft
if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/support/')
needs: [ build, verify ]
needs: [ build, test, inspectCode, verify ]
runs-on: ubuntu-latest
permissions:
contents: write
Expand All @@ -256,7 +262,7 @@ jobs:
- name: Fetch Sources
uses: actions/[email protected]

# Setup Java environment for the next steps
# Set up Java environment for the next steps
- name: Setup Java
uses: actions/[email protected]
with:
Expand Down
10 changes: 6 additions & 4 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 @@ -24,7 +24,7 @@ jobs:
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/[email protected]
with:
Expand All @@ -33,9 +33,11 @@ jobs:

# Setup Gradle
- name: Setup Gradle
uses: gradle/[email protected]
uses: gradle/[email protected]
with:
gradle-home-cache-cleanup: true

# Publish the plugin to the Marketplace
# Publish the plugin to JetBrains Marketplace
- name: Publish Plugin
env:
PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
Expand Down
14 changes: 8 additions & 6 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 @@ -35,7 +35,7 @@ jobs:
- name: Fetch Sources
uses: actions/[email protected]

# Setup Java environment for the next steps
# Set up Java environment for the next steps
- name: Setup Java
uses: actions/[email protected]
with:
Expand All @@ -44,7 +44,9 @@ jobs:

# Setup Gradle
- name: Setup Gradle
uses: gradle/[email protected]
uses: gradle/[email protected]
with:
gradle-home-cache-cleanup: true

# Run IDEA prepared for UI testing
- name: Run IDE
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.

## [Unreleased]
## [1.0.20] - 2023-12-12

### Bug Fixes

- Solve some minor issues and update dependencies

## [1.0.19] - 2023-12-12

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![JetBrains plugins](https://img.shields.io/jetbrains/plugin/d/21659-tauri)](https://plugins.jetbrains.com/plugin/21659-tauri/versions)
[![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/KartanHQ/intellij-tauri/build.yml?branch=master)](https://github.com/KartanHQ/intellij-tauri/actions/workflows/build.yml)
[![GitHub](https://img.shields.io/github/license/KartanHQ/intellij-tauri)](https://github.com/KartanHQ/intellij-tauri/blob/master/LICENSE)
[![Twitter Follow](https://img.shields.io/badge/follow-%40nekofar-1DA1F2?logo=twitter&style=flat)](https://twitter.com/nekofar)
[![X (formerly Twitter) Follow](https://img.shields.io/badge/follow-%40nekofar-ffffff?logo=x&style=flat)](https://x.com/nekofar)
[![Donate](https://img.shields.io/badge/donate-nekofar.crypto-a2b9bc?logo=ko-fi&logoColor=white)](https://ud.me/nekofar.crypto)


Expand Down
5 changes: 5 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,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
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pluginName = IntelliJ Tauri Plugin
pluginRepositoryUrl = https://github.com/KartanHQ/intellij-tauri

# SemVer format -> https://semver.org
pluginVersion = 1.0.19
pluginVersion = 1.0.20

# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
pluginSinceBuild = 222
Expand All @@ -23,7 +23,7 @@ platformPlugins = JavaScript
javaVersion = 17

# 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
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
Loading

0 comments on commit d24a93d

Please sign in to comment.