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

Prepare for 2022.1 #409

Open
wants to merge 22 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ branches:
only:
- main

# build on 64 bit jdk 11
# build on 64 bit jdk 17
environment:
matrix:
- JAVA_HOME: C:\Program Files\Java\jdk11
- JAVA_HOME: C:\Program Files\Java\jdk17
43 changes: 33 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
// Add idea plugin version
plugins {
id "java"
id "org.jetbrains.intellij" version "1.3.0"
id 'java'
id 'idea'
id 'org.jetbrains.intellij' version '1.15.0'
}

// Add coverage plugin
apply plugin: "jacoco"
apply plugin: 'org.jetbrains.intellij'
apply plugin: 'java'

// Add plugin group and version
group "com.dubreuia"
version "2.4.0"
version "2.7.0"

// Add build script repository to maven central
repositories {
Expand All @@ -18,30 +21,44 @@ repositories {

// Add dependencies to test, junit5 api (annotations) and engine (runtime)
dependencies {
testImplementation "org.assertj:assertj-core:3.21.0"
testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.2"
testImplementation "org.junit.jupiter:junit-jupiter-params:5.8.2"
testImplementation "org.junit.jupiter:junit-jupiter-engine:5.8.2"
testImplementation platform('org.junit:junit-bom:5.10.0'),
'org.junit.jupiter:junit-jupiter',
'org.junit.jupiter:junit-jupiter-engine',
'org.assertj:assertj-core:3.24.2'
testRuntimeOnly("org.junit.platform:junit-platform-launcher") {
because("Only needed to run tests in a version of IntelliJ IDEA that bundles older versions")
}
}

// Add intellij task configuration for base intellij version (minimum compatibility)
// This needs to fit the tag <idea-version since-build="xxx"> in plugin.xml
// See https://www.jetbrains.com/intellij-repository/snapshots
// See https://www.jetbrains.com/intellij-repository/releases
intellij {
version = "2021.3"
version = "2023.2"
//version = "LATEST-EAP-SNAPSHOT"
type = "IC"
plugins = ["java"]
pluginName = "Save Actions"
// Do not touch the plugin.xml file
updateSinceUntilBuild = false
}


listProductsReleases {
sinceBuild = "231.*"
}

// JAVA compatibility
compileJava {
sourceCompatibility = "11"
targetCompatibility = "11"
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

compileJava.options.encoding = 'UTF-8'
compileJava.options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
compileTestJava.options.encoding = 'UTF-8'

// Activate junit since gradle 4.7
test {
useJUnitPlatform()
Expand All @@ -59,3 +76,9 @@ jacocoTestReport {
html.required = false
}
}

wrapper() {
gradleVersion = '8.2.1'
distributionUrl = distributionUrl.replace('bin', 'all')
}

4 changes: 2 additions & 2 deletions docs/badge-jetbrains-website.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading