From 8228e72ef7f76a283df544793a8b9f68adceda46 Mon Sep 17 00:00:00 2001
From: Zac Sweers <pandanomic@gmail.com>
Date: Fri, 11 Oct 2024 14:25:37 -0400
Subject: [PATCH] Intellij publishing fixes

---
 build.gradle.kts                           | 17 ++++++++++-------
 platforms/intellij/skate/change-notes.html |  2 ++
 platforms/intellij/skate/gradle.properties |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 03b215214..4f939d003 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -355,7 +355,7 @@ subprojects {
         configure<IntelliJPlatformDependenciesExtension> { intellijIdeaCommunity("2024.2.1") }
       }
 
-      if (hasProperty("SgpIntellijArtifactoryBaseUrl")) {
+      if (hasProperty("FoundryIntellijArtifactoryBaseUrl")) {
         pluginManager.apply(libs.plugins.pluginUploader.get().pluginId)
         val archive = project.tasks.named<BuildPluginTask>("buildPlugin").flatMap { it.archiveFile }
         val blockMapTask =
@@ -366,11 +366,11 @@ subprojects {
             file.set(archive)
             blockmapFile.set(
               project.layout.buildDirectory.file(
-                "blockmap${GenerateBlockMapTask.BLOCKMAP_FILE_SUFFIX}"
+                "blockmap/blockmap${GenerateBlockMapTask.BLOCKMAP_FILE_SUFFIX}"
               )
             )
             blockmapHashFile.set(
-              project.layout.buildDirectory.file("blockmap${GenerateBlockMapTask.HASH_FILE_SUFFIX}")
+              project.layout.buildDirectory.file("blockmap/blockmap${GenerateBlockMapTask.HASH_FILE_SUFFIX}")
             )
           }
 
@@ -380,9 +380,12 @@ subprojects {
           notCompatibleWithConfigurationCache(
             "UploadPluginTask is not compatible with the configuration cache"
           )
+          // TODO why doesn't the flatmap below automatically handle this dependency?
+          dependsOn(blockMapTask)
           blockmapFile.set(blockMapTask.flatMap { it.blockmapFile })
+          blockmapHashFile.set(blockMapTask.flatMap { it.blockmapHashFile })
           url.set(
-            providers.gradleProperty("SgpIntellijArtifactoryBaseUrl").map { baseUrl ->
+            providers.gradleProperty("FoundryIntellijArtifactoryBaseUrl").map { baseUrl ->
               "$baseUrl/${pluginDetails.urlSuffix}"
             }
           )
@@ -398,9 +401,9 @@ subprojects {
           }
           sinceBuild.set(pluginDetails.sinceBuild)
           authentication.set(
-            // Sip the username and token together to create an appropriate encoded auth header
-            providers.gradleProperty("SgpIntellijArtifactoryUsername").zip(
-              providers.gradleProperty("SgpIntellijArtifactoryToken")
+            // Zip the username and token together to create an appropriate encoded auth header
+            providers.gradleProperty("FoundryIntellijArtifactoryUsername").zip(
+              providers.gradleProperty("FoundryIntellijArtifactoryToken")
             ) { username, token ->
               "Basic ${"$username:$token".encode().base64()}"
             }
diff --git a/platforms/intellij/skate/change-notes.html b/platforms/intellij/skate/change-notes.html
index 239c4bdbe..b90a05a38 100644
--- a/platforms/intellij/skate/change-notes.html
+++ b/platforms/intellij/skate/change-notes.html
@@ -3,6 +3,8 @@
 <h2>0.8.0</h2>
 <ul>
     <li>Support K2 with Skate</li>
+    <li>Project Gen now generates Foundry-compatible APIs</li>
+    <li>Raise minimum IntelliJ Platform version to 24.2.1 (Android Studio Ladybug, IntelliJ 2024.2)</li>
 </ul>
 
 <h2>0.7.7</h2>
diff --git a/platforms/intellij/skate/gradle.properties b/platforms/intellij/skate/gradle.properties
index 4a5015ff1..df94d036d 100644
--- a/platforms/intellij/skate/gradle.properties
+++ b/platforms/intellij/skate/gradle.properties
@@ -2,7 +2,7 @@ INTELLIJ_PLUGIN=true
 PLUGIN_ID=com.slack.intellij.skate
 PLUGIN_NAME=Skate
 PLUGIN_DESCRIPTION=A plugin for IntelliJ and Android Studio for faster Kotlin and Android development!
-VERSION_NAME=0.1.0
+VERSION_NAME=0.8.0
 PLUGIN_SINCE_BUILD=242
 ARTIFACTORY_URL_SUFFIX=skate
 # Opt-out flag for bundling Kotlin standard library.