Skip to content

Commit

Permalink
update CI infrastructure with gradle build plugins and "2021.3"
Browse files Browse the repository at this point in the history
  • Loading branch information
Haehnchen committed Apr 9, 2022
1 parent e9eafd8 commit 007107b
Show file tree
Hide file tree
Showing 7 changed files with 155 additions and 71 deletions.
64 changes: 0 additions & 64 deletions build.gradle

This file was deleted.

114 changes: 114 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

fun properties(key: String) = project.findProperty(key).toString()

plugins {
// Java support
id("java")
// Kotlin support
id("org.jetbrains.kotlin.jvm") version "1.6.20"
// Gradle IntelliJ Plugin
id("org.jetbrains.intellij") version "1.5.2"
// Gradle Changelog Plugin
id("org.jetbrains.changelog") version "1.3.1"
// Gradle Qodana Plugin
id("org.jetbrains.qodana") version "0.1.13"
}

group = properties("pluginGroup")
version = properties("pluginVersion")

// Configure project's dependencies
repositories {
mavenCentral()
}

dependencies {
implementation("org.junit.jupiter:junit-jupiter:5.8.2")
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.8.2")
}

// Configure Gradle IntelliJ Plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
intellij {
pluginName.set(properties("pluginName"))
version.set(properties("platformVersion"))
type.set(properties("platformType"))

// Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
plugins.set(properties("platformPlugins").split(',').map(String::trim).filter(String::isNotEmpty))
}

// Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
changelog {
version.set(properties("pluginVersion"))
groups.set(emptyList())
}

// Configure Gradle Qodana Plugin - read more: https://github.com/JetBrains/gradle-qodana-plugin
qodana {
cachePath.set(projectDir.resolve(".qodana").canonicalPath)
reportPath.set(projectDir.resolve("build/reports/inspections").canonicalPath)
saveReport.set(true)
showReport.set(System.getenv("QODANA_SHOW_REPORT")?.toBoolean() ?: false)
}

tasks {
// Set the JVM compatibility versions
properties("javaVersion").let {
withType<JavaCompile> {
sourceCompatibility = it
targetCompatibility = it
}
withType<KotlinCompile> {
kotlinOptions.jvmTarget = it
}
}

wrapper {
gradleVersion = properties("gradleVersion")
}

patchPluginXml {
version.set(properties("pluginVersion"))
sinceBuild.set(properties("pluginSinceBuild"))
// untilBuild.set(properties("pluginUntilBuild"))

// Get the latest available change notes from the changelog file
// changeNotes.set(provider {
// changelog.run {
// getOrNull(properties("pluginVersion")) ?: getLatest()
// }.toHTML()
// })
}

// Configure UI tests plugin
// Read more: https://github.com/JetBrains/intellij-ui-test-robot
runIdeForUiTests {
systemProperty("robot-server.port", "8082")
systemProperty("ide.mac.message.dialogs.as.sheets", "false")
systemProperty("jb.privacy.policy.text", "<!--999.999-->")
systemProperty("jb.consents.confirmation.enabled", "false")
}

signPlugin {
certificateChain.set(System.getenv("CERTIFICATE_CHAIN"))
privateKey.set(System.getenv("PRIVATE_KEY"))
password.set(System.getenv("PRIVATE_KEY_PASSWORD"))
}

publishPlugin {
dependsOn("patchChangelog")
token.set(System.getenv("PUBLISH_TOKEN"))
// pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
// Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
// https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
channels.set(listOf(properties("pluginVersion").split('-').getOrElse(1) { "default" }.split('.').first()))
}

test {
// Support "setUp" like "BasePlatformTestCase::setUp" as valid test structure
useJUnitPlatform {
includeEngines("junit-vintage")
}
}
}
36 changes: 32 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,32 @@
ideaVersion = IU-2021.3
phpPluginVersion = 213.5744.279
twigPluginVersion = 213.5744.224
toolboxPluginVersion = 0.4.6
# IntelliJ Platform Artifacts Repositories
# -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html

pluginGroup = de.espend.idea.php.annotation
pluginName = PHP Annotations

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

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

# IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
platformType = IU
platformVersion = 2021.3

# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
platformPlugins = java,webDeployment,com.jetbrains.php:213.5744.279,de.espend.idea.php.toolbox:6.0.0

# Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
javaVersion = 11

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

# 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"
kotlin.stdlib.default.dependency = false
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,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 1 addition & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = "PHP Annotations"
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,14 @@ public static String getClassDeprecatedMessage(@NotNull PhpClass phpClass) {
PhpDocComment docComment = phpClass.getDocComment();
if (docComment != null) {
for (PhpDocTag deprecatedTag : docComment.getTagElementsByName("@deprecated")) {
String tagValue = deprecatedTag.getTagValue();
// deprecatedTag.getValue provides a number !?
String tagValue = deprecatedTag.getText();
if (StringUtils.isNotBlank(tagValue)) {
return StringUtils.abbreviate("Deprecated: " + tagValue, 100);
String trim = tagValue.replace("@deprecated", "").trim();

if (StringUtils.isNotBlank(tagValue)) {
return StringUtils.abbreviate("Deprecated: " + trim, 100);
}
}
}
}
Expand Down

0 comments on commit 007107b

Please sign in to comment.