Merge in main for 0.15.1

JetBrains · Feb 29, 2024 · b929004 · b929004
2 parents e0c2270 + 526ed08
commit b929004
Show file tree

Hide file tree

Showing 32 changed files with 84 additions and 29 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
 commonmark = "0.21.0"
-composeDesktop = "1.6.0-dev1440"
+composeDesktop = "1.6.10-dev1457"
 detekt = "1.23.4"
 dokka = "1.8.20"
 idea = "232.10300.40"
 ideaGradlePlugin = "1.17.1"
 jna = "5.14.0"
 kotlin = "1.8.21"
-kotlinSarif = "0.4.0"
-kotlinpoet = "1.14.2"
+kotlinSarif = "0.5.0"
+kotlinpoet = "1.15.2"
 kotlinterGradlePlugin = "3.16.0"
 kotlinxSerialization = "1.5.1"
 kotlinxBinaryCompat = "0.14.0"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/...gin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/releasessample/ContentSource.kt b/...gin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/releasessample/ContentSource.kt
@@ -303,9 +303,17 @@ object AndroidReleases : ContentSource<ContentItem.AndroidRelease>() {
             imagePath = "/android-releases/14.svg",
             versionName = "14",
             codename = "Upside Down Cake",
-            apiLevel = 33,
+            apiLevel = 34,
             releaseDate = LocalDate(2023, 10, 4),
         ),
+        ContentItem.AndroidRelease(
+            displayText = "Android 15 (preview)",
+            imagePath = "/android-releases/15.svg",
+            versionName = "15",
+            codename = "Vanilla Ice Cream",
+            apiLevel = 35,
+            releaseDate = LocalDate(2024, 2, 17),
+        ),
     )
 
     override val displayName = "Android releases"

diff --git a/samples/ide-plugin/src/main/resources/android-releases/15.svg b/samples/ide-plugin/src/main/resources/android-releases/15.svg
diff --git a/samples/ide-plugin/src/main/resources/android-releases/cupcake.png b/samples/ide-plugin/src/main/resources/android-releases/cupcake.png
diff --git a/samples/ide-plugin/src/main/resources/android-releases/jelly-bean.svg b/samples/ide-plugin/src/main/resources/android-releases/jelly-bean.svg
diff --git a/samples/ide-plugin/src/main/resources/android-releases/pie.svg b/samples/ide-plugin/src/main/resources/android-releases/pie.svg
diff --git a/samples/ide-plugin/src/main/resources/icons/github.svg b/samples/ide-plugin/src/main/resources/icons/github.svg
diff --git a/samples/ide-plugin/src/main/resources/icons/[email protected] b/samples/ide-plugin/src/main/resources/icons/[email protected]