From 1731eda786b21895e9d2b9c8908cde6b7d65b444 Mon Sep 17 00:00:00 2001 From: meanmail Date: Sat, 15 Oct 2022 22:18:40 +0400 Subject: [PATCH] Update build --- .gitignore | 1 + CHANGES.md | 4 ++++ build.gradle.kts | 18 ++++++++++++------ gradle.properties | 5 ++++- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 9fe9396..3d21afa 100644 --- a/.gitignore +++ b/.gitignore @@ -124,3 +124,4 @@ build .gradle src/main/gen .idea/csv-plugin.xml +token.txt diff --git a/CHANGES.md b/CHANGES.md index 2fc7fca..485cdfa 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +## 2022.4 (October, 15, 2022) + +* Fix NullPointerException + ## 2022.3.1 (October, 9, 2022) * Fix JsonDecodingException diff --git a/build.gradle.kts b/build.gradle.kts index 02f4dbb..3deed66 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,17 +8,18 @@ repositories { plugins { java - kotlin("jvm") version "1.6.20" - kotlin("plugin.serialization") version "1.6.20" +// https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library + kotlin("jvm") version "1.5.10" + kotlin("plugin.serialization") version "1.5.10" id("org.jetbrains.intellij") version "1.9.0" } group = config("group") -version = "${config("version")}-${config("platformVersion")}" +version = config("version") dependencies { - compileOnly("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20") - val serializationVersion = "1.3.2" + compileOnly("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.10") + val serializationVersion = "1.4.0" compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:$serializationVersion") compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion") implementation("io.sentry:sentry:6.4.3") @@ -36,6 +37,7 @@ intellij { } ) type.set(config("platformType")) + updateSinceUntilBuild.set(false) val usePlugins = config("usePlugins").split(',') for (plugin in usePlugins) { @@ -48,9 +50,11 @@ intellij { "PY" -> { plugins.add("python") } + "PC" -> { plugins.add("PythonCore") } + else -> { plugins.add("PythonCore:${version}") } @@ -120,13 +124,15 @@ tasks { version.set(project.version.toString()) pluginDescription.set(file("description.html").readText()) changeNotes.set(readChangeNotes("CHANGES.md")) + sinceBuild.set(config("platformSinceBuild")) } publishPlugin { dependsOn("buildPlugin") - token.set(System.getenv("PUBLISH_TOKEN")) + token.set(file("token.txt").readText()) channels.set(listOf(config("publishChannel"))) } + buildSearchableOptions { enabled = false } diff --git a/gradle.properties b/gradle.properties index 01b0ddd..33cdb46 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,20 @@ # Gradle gradleVersion=7.5.1 org.gradle.parallel=true +# https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html#intellij-platform-based-products-of-recent-ide-versions jvmVersion=11 # # Plugin group=dev.meanmail repository=https://github.com/meanmail-dev/requirements pluginName=requirements -version=2022.3.1 +version=2022.3.2 # https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library kotlin.stdlib.default.dependency=false # # Platform +platformSinceBuild=212 +# Develop platform platformVersion=2022.2.2 platformType=PC usePlugins=python:222.4167.37