From 50eb81951d95e6701f71175bb6511a5a97c349d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 18:23:27 +0000 Subject: [PATCH 1/9] Bump JetBrains/qodana-action from 2024.1.5 to 2024.1.8 Bumps [JetBrains/qodana-action](https://github.com/jetbrains/qodana-action) from 2024.1.5 to 2024.1.8. - [Release notes](https://github.com/jetbrains/qodana-action/releases) - [Commits](https://github.com/jetbrains/qodana-action/compare/v2024.1.5...v2024.1.8) --- updated-dependencies: - dependency-name: JetBrains/qodana-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 77c251a..d7cce85 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -170,7 +170,7 @@ jobs: # Run Qodana inspections - name: Qodana - Code Inspection - uses: JetBrains/qodana-action@v2024.1.5 + uses: JetBrains/qodana-action@v2024.1.8 with: cache-default-branch-only: true From 9270bdd4ec3e6a3e6998694db4a809756ff3d623 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 18:53:46 +0000 Subject: [PATCH 2/9] Bump org.jetbrains.changelog from 2.2.0 to 2.2.1 Bumps org.jetbrains.changelog from 2.2.0 to 2.2.1. --- updated-dependencies: - dependency-name: org.jetbrains.changelog dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 815b5a2..75f4a4d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ exampleLibrary = "24.1.0" # plugins kotlin = "2.0.0" -changelog = "2.2.0" +changelog = "2.2.1" gradleIntelliJPlugin = "1.17.4" qodana = "2024.1.5" kover = "0.8.1" From a7e2038086f25705e84967de6a2882b410840d97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jul 2024 18:23:57 +0000 Subject: [PATCH 3/9] Bump org.jetbrains.kotlinx.kover from 0.8.1 to 0.8.3 Bumps [org.jetbrains.kotlinx.kover](https://github.com/Kotlin/kotlinx-kover) from 0.8.1 to 0.8.3. - [Release notes](https://github.com/Kotlin/kotlinx-kover/releases) - [Changelog](https://github.com/Kotlin/kotlinx-kover/blob/main/CHANGELOG.md) - [Commits](https://github.com/Kotlin/kotlinx-kover/compare/v0.8.1...v0.8.3) --- updated-dependencies: - dependency-name: org.jetbrains.kotlinx.kover dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 815b5a2..3106020 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ kotlin = "2.0.0" changelog = "2.2.0" gradleIntelliJPlugin = "1.17.4" qodana = "2024.1.5" -kover = "0.8.1" +kover = "0.8.3" [libraries] exampleLibrary = { group = "com.example", name = "exampleLibrary", version.ref = "exampleLibrary" } From f033c7e90ad32539f8369742e0782ea8c30b96cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 18:27:11 +0000 Subject: [PATCH 4/9] Bump org.jetbrains.kotlin.jvm from 2.0.0 to 2.0.20 Bumps [org.jetbrains.kotlin.jvm](https://github.com/JetBrains/kotlin) from 2.0.0 to 2.0.20. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.0.20/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.0...v2.0.20) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin.jvm dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 815b5a2..db15eff 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ exampleLibrary = "24.1.0" # plugins -kotlin = "2.0.0" +kotlin = "2.0.20" changelog = "2.2.0" gradleIntelliJPlugin = "1.17.4" qodana = "2024.1.5" From de2dc5d3be6a46db0b1c20b789261dd3de5a5eb9 Mon Sep 17 00:00:00 2001 From: Jonas Ha Date: Fri, 29 Nov 2024 19:17:02 -0500 Subject: [PATCH 5/9] added code to fix auto deployment and version limit --- .gitignore | 4 ++++ build.gradle.kts | 18 ++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 97a8204..19fc996 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,7 @@ .qodana build /keys/ + +/certs/ + +**/.env \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 5201b4e..40ec2bd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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) @@ -60,7 +71,11 @@ tasks { patchPluginXml { version = properties("pluginVersion") sinceBuild = properties("pluginSinceBuild") - untilBuild = properties("pluginUntilBuild") + // 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 section from README.md and provide for the // plugin's manifest @@ -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 -> From 67e41991ac3cc2a83020ad49ea3e7a7da9895515 Mon Sep 17 00:00:00 2001 From: Jonas Ha Date: Fri, 29 Nov 2024 19:45:20 -0500 Subject: [PATCH 6/9] removed test and pluginUntilBuild --- build.gradle.kts | 2 +- gradle.properties | 2 +- src/test/testData/rename/foo.xml | 3 --- src/test/testData/rename/foo_after.xml | 3 --- 4 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 src/test/testData/rename/foo.xml delete mode 100644 src/test/testData/rename/foo_after.xml diff --git a/build.gradle.kts b/build.gradle.kts index 40ec2bd..0c16e1e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -71,7 +71,7 @@ tasks { patchPluginXml { version = properties("pluginVersion") sinceBuild = properties("pluginSinceBuild") - // untilBuild = properties("pluginUntilBuild") + untilBuild = properties("pluginUntilBuild") val changelog = project.changelog // local variable for configuration cache compatibility diff --git a/gradle.properties b/gradle.properties index 32b78f2..646e210 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/src/test/testData/rename/foo.xml b/src/test/testData/rename/foo.xml deleted file mode 100644 index b21e9f2..0000000 --- a/src/test/testData/rename/foo.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 1>Foo - diff --git a/src/test/testData/rename/foo_after.xml b/src/test/testData/rename/foo_after.xml deleted file mode 100644 index 980ca96..0000000 --- a/src/test/testData/rename/foo_after.xml +++ /dev/null @@ -1,3 +0,0 @@ - - Foo - From b64f7686cc343f60d12514842b88b4b5711d3ad0 Mon Sep 17 00:00:00 2001 From: Jonas Ha Date: Fri, 29 Nov 2024 19:51:13 -0500 Subject: [PATCH 7/9] updated CHANGELOG and set version to be set from CHANGELOG.md --- CHANGELOG.md | 6 ++++++ build.gradle.kts | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ca3f28..72b7da1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ ## Unreleased +## [1.0.2] - 2024-11-29 + +### Changed + +- Removed build version limitation. + ## [1.0.1] - 2024-06-23 ### Changed diff --git a/build.gradle.kts b/build.gradle.kts index 0c16e1e..6bdd06b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,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() } From 7651357704374cd211e32e2fc2a6b900a3b5fbdd Mon Sep 17 00:00:00 2001 From: Jonas Ha Date: Fri, 29 Nov 2024 19:53:44 -0500 Subject: [PATCH 8/9] updated gradle action to v4 --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d7cce85..ed90a98 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 @@ -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 @@ -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 From e09385ce197e3308036f139d9f4567c4b8f27881 Mon Sep 17 00:00:00 2001 From: Jonas Ha Date: Fri, 29 Nov 2024 19:54:37 -0500 Subject: [PATCH 9/9] updated gradle action to v4 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8db806b..04f7cb5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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