Skip to content
This repository has been archived by the owner on Feb 23, 2024. It is now read-only.

Commit

Permalink
chore: Upgrade to chutney 1.7.1 and jdk17 (#16)
Browse files Browse the repository at this point in the history
  • Loading branch information
nbrouand authored Mar 24, 2023
1 parent 4d0779d commit bf49019
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.11
- name: Set up JDK 1.17
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: 11
java-version: 17
- name: Setup Gradle
uses: gradle/gradle-build-action@v2

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
- uses: actions/checkout@v2
- name: Set release version environment variable
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Set up JDK 1.11
- name: Set up JDK 1.17
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: 11
java-version: 17
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
- name: Cache maven
Expand Down
14 changes: 7 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
// Kotlin support
id("org.jetbrains.kotlin.jvm") version "1.6.10"
// gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
id("org.jetbrains.intellij") version "1.7.0"
id("org.jetbrains.intellij") version "1.13.2"
// gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
id("org.jetbrains.changelog") version "1.3.1"
}
Expand Down Expand Up @@ -52,7 +52,7 @@ dependencies {
implementation("com.fasterxml.jackson.core", "jackson-annotations")
implementation("com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml")
implementation("org.jetbrains:annotations") {
version { strictly("23.0.0") }
version { strictly("24.0.0") }
}

// https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-script-util
Expand Down Expand Up @@ -91,7 +91,7 @@ intellij {
}
}
configure<JavaPluginConvention> {
sourceCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
}

// Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
Expand All @@ -102,13 +102,13 @@ changelog {


tasks {
// Set the compatibility versions to 11
// Set the compatibility versions to 17
withType<JavaCompile> {
sourceCompatibility = "11"
targetCompatibility = "11"
sourceCompatibility = "17"
targetCompatibility = "17"
}
withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions.jvmTarget = "11"
kotlinOptions.jvmTarget = "17"
}


Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ kotlin.code.style=official

pluginGroup = com.chutneytesting.idea
pluginName = chutney-idea-plugin
pluginVersion = 2.2
pluginVersion = 2.3

# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
# for insight into build numbers and IntelliJ Platform versions.
pluginSinceBuild = 221
pluginUntilBuild = 222.*
pluginSinceBuild = 222
pluginUntilBuild = 223.*

# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
# See https://jb.gg/intellij-platform-builds-list for available build versions.
pluginVerifierIdeVersions = 2022.1.3
pluginVerifierIdeVersions = 2022.2.3

platformType = IU
platformVersion = 2022.1
platformVersion = 2022.2
platformDownloadSources = false

# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
Expand All @@ -28,5 +28,5 @@ platformPlugins =com.intellij.java, com.intellij.spring, org.jetbrains.plugins.y
# See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
kotlin.stdlib.default.dependency = false

chutneyVersion = 1.7.0
chutneyIdeaServerVersion = 1.7.0
chutneyVersion = 1.7.1
chutneyIdeaServerVersion = 1.7.1
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 5 additions & 1 deletion src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@
<id>com.chutneytesting.idea.chutney-idea-plugin</id>
<name>Chutney</name>
<vendor email="[email protected]" url="https://github.com/chutney-testing/chutney">ChutneyTesting</vendor>
<version>0.11.0</version>
<version>2.3</version>
<description><![CDATA[
<p>A plugin to help you easily edit, run chutney scenario files.</p><br/>
]]></description>

<change-notes><![CDATA[
Version 2.3<br>
<ul>
<li>Upgrade to chutney 1.7.1 with java 17</li>
</ul>
Version 0.10.0<br>
<ul>
<li>Fix version sent when updating scenario on remote server</li>
Expand Down

0 comments on commit bf49019

Please sign in to comment.