Skip to content

Commit

Permalink
Upgrade versions (copy from the plugin template)
Browse files Browse the repository at this point in the history
  • Loading branch information
ILIYANGERMANOV committed Jun 21, 2023
1 parent 149241b commit f9c060c
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 26 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,13 @@ jobs:
- name: Gradle Wrapper Validation
uses: gradle/[email protected]

# Setup Java 11 environment for the next steps
# Setup Java environment for the next steps
- name: Setup Java
uses: actions/setup-java@v3
with:
distribution: zulu
java-version: 11
java-version: 17
cache: gradle

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

# Run Qodana inspections
- name: Qodana - Code Inspection
uses: JetBrains/qodana-action@v2022.3.4
uses: JetBrains/qodana-action@v2023.1.0

# Prepare plugin archive content for creating artifact
- name: Prepare Plugin Artifact
Expand Down Expand Up @@ -171,4 +172,4 @@ jobs:
--notes "$(cat << 'EOM'
${{ needs.build.outputs.changelog }}
EOM
)"
)"
11 changes: 8 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ 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(11)
jvmToolchain(17)
}

// Configure Gradle IntelliJ Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html
Expand Down Expand Up @@ -58,10 +58,15 @@ qodana {
}

// Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration
kover.xmlReport {
onCheck = true
koverReport {
defaults {
xml {
onCheck = true
}
}
}


tasks {
wrapper {
gradleVersion = properties("gradleVersion").get()
Expand Down
25 changes: 10 additions & 15 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
# IntelliJ Platform Artifacts Repositories -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html

pluginGroup = com.ivyapps.composehammer
pluginName = compose-hammer-m3-ui-builder
pluginRepositoryUrl = https://github.com/ILIYANGERMANOV/compose-material3-helper-plugin
pluginGroup=com.ivyapps.composehammer
pluginName=compose-hammer-m3-ui-builder
pluginRepositoryUrl=https://github.com/ILIYANGERMANOV/compose-material3-helper-plugin
# SemVer format -> https://semver.org
pluginVersion=2023.6.21

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

pluginSinceBuild=222
pluginUntilBuild=232.*
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
platformType = IC
platformVersion = 2022.1.4

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

platformPlugins=com.intellij.java
# Gradle Releases -> https://github.com/gradle/gradle/releases
gradleVersion = 8.1
gradleVersion=8.1.1

# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
kotlin.stdlib.default.dependency = false
Expand All @@ -34,4 +29,4 @@ org.gradle.caching = true
systemProp.org.gradle.unsafe.kotlin.assignment = true

# Temporary workaround for Kotlin Compiler OutOfMemoryError -> https://jb.gg/intellij-platform-kotlin-oom
kotlin.incremental.useClasspathSnapshot = false
kotlin.incremental.useClasspathSnapshot = false
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ annotations = "24.0.1"

# plugins
dokka = "1.8.10"
kotlin = "1.8.20"
changelog = "2.0.0"
gradleIntelliJPlugin = "1.13.3"
kotlin = "1.8.21"
changelog = "2.1.0"
gradleIntelliJPlugin = "1.14.1"
qodana = "0.1.13"
kover = "0.6.1"
kover = "0.7.1"
kotlinxSerialization = "1.5.1"

[libraries]
Expand Down
2 changes: 2 additions & 0 deletions qodana.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
# https://www.jetbrains.com/help/qodana/qodana-yaml.html

version: 1.0
linter: jetbrains/qodana-jvm-community:latest
projectJDK: 17
profile:
name: qodana.recommended
exclude:
Expand Down

0 comments on commit f9c060c

Please sign in to comment.