Merged branch idea243.release into idea243.x

JetBrains · Jan 23, 2025 · 7705be2 · 7705be2
2 parents 9929d84 + 27bc272
commit 7705be2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/sbt/sbt-impl/test/org/jetbrains/sbt/project/SbtProjectStructureImportingTest.scala b/sbt/sbt-impl/test/org/jetbrains/sbt/project/SbtProjectStructureImportingTest.scala
@@ -435,7 +435,7 @@ final class SbtProjectStructureImportingTest extends SbtProjectStructureImportin
 
       // NOTE: sbtIdeaPlugin also has inner module named `sbt-idea-plugin` (with dashes), but it's separate, non-root module
       val sbtIdeaPlugin = new module("sbtIdeaPlugin") {
-        sbtBuildURI := new URI("https://github.com/JetBrains/sbt-idea-plugin.git")
+        sbtBuildURI := new URI("https://github.com/JetBrains/sbt-idea-plugin.git#master")
         sbtProjectId := "sbtIdeaPlugin"
       }
 

diff --git a/...brains/sbt/project/SbtProjectStructureImportingTest_ProdTestSourcesSeparatedEnabled.scala b/...brains/sbt/project/SbtProjectStructureImportingTest_ProdTestSourcesSeparatedEnabled.scala
@@ -611,15 +611,15 @@ final class SbtProjectStructureImportingTest_ProdTestSourcesSeparatedEnabled ext
 
         // NOTE: sbtIdeaPlugin also has inner module named `sbt-idea-plugin` (with dashes), but it's separate, non-root module
         new module("sbtIdeaPlugin") {
-          sbtBuildURI := new URI("https://github.com/JetBrains/sbt-idea-plugin.git")
+          sbtBuildURI := new URI("https://github.com/JetBrains/sbt-idea-plugin.git#master")
           sbtProjectId := "sbtIdeaPlugin"
         },
         new module("sbtIdeaPlugin.main") {
-          sbtBuildURI := new URI("https://github.com/JetBrains/sbt-idea-plugin.git")
+          sbtBuildURI := new URI("https://github.com/JetBrains/sbt-idea-plugin.git#master")
           sbtProjectId := "sbtIdeaPlugin"
         },
         new module("sbtIdeaPlugin.test") {
-          sbtBuildURI := new URI("https://github.com/JetBrains/sbt-idea-plugin.git")
+          sbtBuildURI := new URI("https://github.com/JetBrains/sbt-idea-plugin.git#master")
           sbtProjectId := "sbtIdeaPlugin"
         },
         new module("sbtIdeaPlugin-build", sbtIdeaPluginGroup),

diff --git a/scala/scala-impl/testdata/sbt/projects/SCL14635/build.sbt b/scala/scala-impl/testdata/sbt/projects/SCL14635/build.sbt
@@ -9,7 +9,7 @@ lazy val root = (project in file("."))
 
 // projects with non-file/git uris should import correctly
 
-lazy val uriSchemeGit = RootProject(uri("https://github.com/JetBrains/sbt-idea-plugin.git"))
+lazy val uriSchemeGit = RootProject(uri("https://github.com/JetBrains/sbt-idea-plugin.git#master"))
 
 lazy val uriSchemeGitWithBranch = RootProject(uri("https://github.com/JetBrains/sbt-idea-shell.git#master"))