Skip to content

Commit 966708f

Browse files
committed
🚀: release v0.7.5 [release]
1 parent 884b260 commit 966708f

File tree

3 files changed

+25
-45
lines changed

3 files changed

+25
-45
lines changed

build.gradle.kts

Lines changed: 19 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import org.jetbrains.changelog.markdownToHTML
22
import org.jetbrains.intellij.tasks.RunPluginVerifierTask.FailureLevel
3-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
43

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

@@ -20,13 +19,13 @@ plugins {
2019
// Java support
2120
id("java")
2221
// Kotlin support
23-
id("org.jetbrains.kotlin.jvm") version "1.5.31"
22+
id("org.jetbrains.kotlin.jvm") version "1.7.10"
2423
// Gradle IntelliJ Plugin
25-
id("org.jetbrains.intellij") version "1.5.2"
24+
id("org.jetbrains.intellij") version "1.7.0"
2625
// Gradle Changelog Plugin
27-
id("org.jetbrains.changelog") version "1.3.0"
26+
id("org.jetbrains.changelog") version "1.3.1"
2827

29-
kotlin("plugin.serialization") version "1.5.31"
28+
kotlin("plugin.serialization") version "1.7.10"
3029
}
3130

3231
group = properties("pluginGroup")
@@ -38,19 +37,26 @@ repositories {
3837
mavenCentral()
3938
}
4039

40+
// Set the JVM language level used to compile sources and generate files - Java 11 is required since 2020.3
41+
kotlin {
42+
jvmToolchain {
43+
languageVersion.set(JavaLanguageVersion.of(11))
44+
}
45+
}
46+
4147
dependencies {
42-
val ktor_version = "1.6.4"
48+
val ktor_version = "2.1.0"
4349

44-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
45-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.5.2")
46-
implementation("org.jetbrains.kotlin:kotlin-reflect:1.5.31")
47-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.0")
50+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
51+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.6.4")
52+
implementation("org.jetbrains.kotlin:kotlin-reflect:1.7.10")
53+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0")
4854
implementation("io.ktor:ktor-client-core:$ktor_version")
4955
implementation("io.ktor:ktor-client-java:$ktor_version")
5056

51-
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
52-
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
53-
testImplementation("io.mockk:mockk:1.11.0")
57+
testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0")
58+
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0")
59+
testImplementation("io.mockk:mockk:1.12.7")
5460
}
5561

5662
configurations {
@@ -73,8 +79,6 @@ intellij {
7379
pluginName.set(properties("pluginName"))
7480
version.set(properties("platformVersion"))
7581
type.set(properties("platformType"))
76-
downloadSources.set(properties("platformDownloadSources").toBoolean())
77-
updateSinceUntilBuild.set(true)
7882

7983
// Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
8084
plugins.set(properties("platformPlugins").split(',').map(String::trim).filter(String::isNotEmpty))
@@ -101,18 +105,6 @@ tasks {
101105
useJUnitPlatform()
102106
}
103107

104-
// Set the JVM compatibility versions
105-
properties("javaVersion").let {
106-
withType<JavaCompile> {
107-
sourceCompatibility = it
108-
targetCompatibility = it
109-
}
110-
withType<KotlinCompile> {
111-
kotlinOptions.jvmTarget = it
112-
kotlinOptions.freeCompilerArgs = listOf("-Xjvm-default=compatibility")
113-
}
114-
}
115-
116108
wrapper {
117109
gradleVersion = properties("gradleVersion")
118110
}
@@ -136,15 +128,6 @@ tasks {
136128
failureLevel.set(failLevel)
137129
}
138130

139-
// Configure UI tests plugin
140-
// Read more: https://github.com/JetBrains/intellij-ui-test-robot
141-
runIdeForUiTests {
142-
systemProperty("robot-server.port", "8082")
143-
systemProperty("ide.mac.message.dialogs.as.sheets", "false")
144-
systemProperty("jb.privacy.policy.text", "<!--999.999-->")
145-
systemProperty("jb.consents.confirmation.enabled", "false")
146-
}
147-
148131
signPlugin {
149132
certificateChain.set(System.getenv("CERTIFICATE_CHAIN"))
150133
privateKey.set(System.getenv("PRIVATE_KEY"))

gradle.properties

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,10 @@ pluginVerifierIdeVersions=CL-2020.3.4, CL-2021.1.3, CL-2021.2.4, CL-2021.3.4, CL
1313

1414
platformType=CL
1515
platformVersion=LATEST-EAP-SNAPSHOT
16-
platformDownloadSources=true
1716
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
1817
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
1918
platformPlugins=
20-
# Java language level used to compile sources and to generate the files for - Java 17 is required since 2022.2
21-
javaVersion=17
22-
gradleVersion=7.2
19+
gradleVersion=7.5.1
2320
# Opt-out flag for bundling Kotlin standard library.
2421
# See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
2522
# suppress inspection "UnusedProperty"

src/main/kotlin/com/github/pushpavel/autocp/common/analytics/GoogleAnalytics.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import com.intellij.openapi.components.Service
1010
import com.intellij.openapi.extensions.PluginId
1111
import com.intellij.openapi.util.SystemInfo
1212
import io.ktor.client.*
13-
import io.ktor.client.features.observer.*
13+
import io.ktor.client.plugins.observer.*
1414
import io.ktor.client.request.*
1515
import io.ktor.client.statement.*
1616
import io.ktor.http.*
@@ -25,15 +25,15 @@ class GoogleAnalytics {
2525
private val httpClient = HttpClient {
2626
expectSuccess = false
2727
ResponseObserver { response ->
28-
println("HTTP status: ${response.status.value}\n${response.readText()}")
28+
println("HTTP status: ${response.status.value}\n${response.bodyAsText()}")
2929
}
3030
}
3131

3232
fun sendEvent(event: Event) {
3333
scope.launch {
34-
httpClient.post<String>("${R.keys.analyticsEndPoint}?measurement_id=${R.keys.analyticsMeasurementId}&api_secret=${R.keys.analyticsApiSecret}") {
34+
httpClient.post("${R.keys.analyticsEndPoint}?measurement_id=${R.keys.analyticsMeasurementId}&api_secret=${R.keys.analyticsApiSecret}") {
3535
contentType(ContentType.Application.Json)
36-
body = buildJsonObject {
36+
setBody(buildJsonObject {
3737
put("client_id", PropertiesComponent.getInstance().analyticsClientId)
3838
putJsonObject("user_properties") {
3939
putJsonObject("os") {
@@ -53,7 +53,7 @@ class GoogleAnalytics {
5353
putJsonArray("events") {
5454
addJsonObject { event.buildJsonObj(this) }
5555
}
56-
}.toString().also { println(it) }.encodeToByteArray()
56+
}.toString().also { println(it) }.encodeToByteArray())
5757
}
5858
}
5959
}

0 commit comments

Comments
 (0)