Support for Android Studio DMG archives

JetBrains · May 20, 2024 · 6d26071 · 6d26071
1 parent 92e4348
commit 6d26071
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Added
 
+- Support for Android Studio DMG archives
 - Introduce `VerifyPluginProjectConfigurationTask.hasModulePlugin` to exclude modules using `org.jetbrains.intellij.platform.module` subplugin from `plugin.xml` checks.
 
 ## [2.0.0-beta3] - 2024-05-18

diff --git a/...rg/jetbrains/intellij/platform/gradle/extensions/IntelliJPlatformRepositoriesExtension.kt b/...rg/jetbrains/intellij/platform/gradle/extensions/IntelliJPlatformRepositoriesExtension.kt
@@ -161,7 +161,10 @@ abstract class IntelliJPlatformRepositoriesExtension @Inject constructor(
     fun binaryReleasesAndroidStudio(action: IvyRepositoryAction = {}) = createIvyRepository(
         name = "Android Studio Binary Releases",
         url = Locations.ANDROID_STUDIO_BINARY_RELEASES,
-        patterns = listOf("/ide-zips/[revision]/[artifact]-[revision]-[classifier].[ext]"),
+        patterns = listOf(
+            "/ide-zips/[revision]/[artifact]-[revision]-[classifier].[ext]",
+            "/install/[revision]/[artifact]-[revision]-[classifier].[ext]",
+        ),
         action = {
             repositories.exclusiveContent {
                 forRepositories(this@createIvyRepository)

diff --git a/.../org/jetbrains/intellij/platform/gradle/providers/AndroidStudioDownloadLinkValueSource.kt b/.../org/jetbrains/intellij/platform/gradle/providers/AndroidStudioDownloadLinkValueSource.kt
@@ -59,8 +59,8 @@ abstract class AndroidStudioDownloadLinkValueSource : ValueSource<String, Parame
         item.downloads
             .asSequence()
             .map { it.link }
-            .filter { link -> link.contains("ide-zips") }
             .filter { link -> link.substringAfterLast('/').contains(os) }
+            .filterNot { link -> link.endsWith(".deb") || link.endsWith(".exe") } // Extracting of .deb and .exe archives is not supported.
             .sortedWith(compareByDescending { link ->
                 val arch = when {
                     os == "mac" && System.getProperty("os.arch") == "aarch64" -> "arm"