Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/gradle/org.jetbrains.qodana-2024.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
j-d-ha authored Nov 30, 2024
2 parents ce2d7e5 + e09385c commit cf4f6c8
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 17 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

# Setup Gradle
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
with:
gradle-home-cache-cleanup: true

Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:

# Setup Gradle
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
with:
gradle-home-cache-cleanup: true

Expand Down Expand Up @@ -170,7 +170,7 @@ jobs:

# Run Qodana inspections
- name: Qodana - Code Inspection
uses: JetBrains/[email protected].5
uses: JetBrains/[email protected].8
with:
cache-default-branch-only: true

Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:

# Setup Gradle
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
with:
gradle-home-cache-cleanup: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

# Setup Gradle
- name: Setup Gradle
uses: gradle/action/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
with:
gradle-home-cache-cleanup: true

Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@
.qodana
build
/keys/

/certs/

**/.env
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@

## Unreleased

## [1.0.2] - 2024-11-29

### Changed

- Removed build version limitation.

## [1.0.1] - 2024-06-23

### Changed
Expand Down
18 changes: 16 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
import org.jetbrains.changelog.Changelog
import org.jetbrains.changelog.markdownToHTML
import java.io.FileReader
import java.util.Properties
import kotlin.apply

// load .env file if it exists
File(".env").takeIf(File::exists)?.let {
Properties().apply {
load(FileReader(it))
println(".env file found")
}
}

fun properties(key: String) = providers.gradleProperty(key)

Expand All @@ -16,7 +27,7 @@ plugins {

group = properties("pluginGroup").get()

version = properties("pluginVersion").get()
version = project.changelog.getAll().keys.toList().first { Regex("""\d+\.\d+\.\d+""").matches(it) }

// Configure project's dependencies
repositories { mavenCentral() }
Expand Down Expand Up @@ -62,6 +73,10 @@ tasks {
sinceBuild = properties("pluginSinceBuild")
untilBuild = properties("pluginUntilBuild")

val changelog = project.changelog // local variable for configuration cache compatibility

version = changelog.getAll().keys.toList().first { Regex("""\d+\.\d+\.\d+""").matches(it) }

// Extract the <!-- Plugin description --> section from README.md and provide for the
// plugin's manifest
pluginDescription =
Expand All @@ -80,7 +95,6 @@ tasks {
}
}

val changelog = project.changelog // local variable for configuration cache compatibility
// Get the latest available change notes from the changelog file
changeNotes =
properties("pluginVersion").map { pluginVersion ->
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pluginRepositoryUrl=https://github.com/j-d-ha/Code-Divider
pluginVersion=1.0.1
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
pluginSinceBuild=232
pluginUntilBuild=242.*
#pluginUntilBuild=242.*
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
platformType=IC
platformVersion=2023.2.6
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
exampleLibrary = "24.1.0"

# plugins
kotlin = "2.0.0"
changelog = "2.2.0"
kotlin = "2.0.21"
changelog = "2.2.1"
gradleIntelliJPlugin = "1.17.4"
qodana = "2024.2.3"
kover = "0.8.1"
kover = "0.8.3"

[libraries]
exampleLibrary = { group = "com.example", name = "exampleLibrary", version.ref = "exampleLibrary" }
Expand Down
3 changes: 0 additions & 3 deletions src/test/testData/rename/foo.xml

This file was deleted.

3 changes: 0 additions & 3 deletions src/test/testData/rename/foo_after.xml

This file was deleted.

0 comments on commit cf4f6c8

Please sign in to comment.