Skip to content

Commit 11e9765

Browse files
committed
Version bump
1 parent 857c7f9 commit 11e9765

File tree

3 files changed

+29
-20
lines changed

3 files changed

+29
-20
lines changed

build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import org.jetbrains.sbtidea.{AutoJbr, JbrPlatform}
22

33
lazy val scala213 = "2.13.15"
4-
lazy val scalaPluginVersion = "2024.3.18"
4+
lazy val scalaPluginVersion = "2024.3.35"
55
lazy val minorVersion = "0"
66
lazy val buildVersion = sys.env.getOrElse("ZIO_INTELLIJ_BUILD_NUMBER", minorVersion)
7-
lazy val pluginVersion = s"2024.3.35.$buildVersion"
7+
lazy val pluginVersion = s"2024.3.36.$buildVersion"
88

99
ThisBuild / intellijPluginName := "zio-intellij"
1010
ThisBuild / intellijBuild := "243"

src/main/resources/META-INF/plugin.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<change-notes>replaced-by-build</change-notes>
2121

22-
<idea-version since-build="243.16718" until-build="243.*"/>
22+
<idea-version since-build="243.21565.193" until-build="243.*"/>
2323

2424
<depends>org.intellij.scala</depends>
2525
<depends>com.intellij.modules.java</depends>

src/main/scala/zio/intellij/project/npw/template/wizard/buildSystem/ZioNewProjectWizardStep.scala

+26-17
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import scala.annotation.nowarn
3939
final class ZioNewProjectWizardStep(parent: ScalaNewProjectWizardMultiStep)
4040
extends ScalaNewProjectWizardStep(parent)
4141
with SbtScalaNewProjectWizardData
42-
with ScalaGitNewProjectWizardData
4342
with ScalaSampleCodeNewProjectWizardData
4443
with ZioModuleStepLike {
4544

@@ -49,8 +48,7 @@ final class ZioNewProjectWizardStep(parent: ScalaNewProjectWizardMultiStep)
4948
@TestOnly override private[project] def setAddSampleCode(value: java.lang.Boolean): Unit =
5049
addSampleCodeProperty.set(value)
5150

52-
@TestOnly override private[project] def setGit(value: java.lang.Boolean): Unit = gitProperty.set(value)
53-
@TestOnly override def setScalaVersion(version: String): Unit = scalaVersionComboBox.setSelectedItemEnsuring(version)
51+
@TestOnly override def setScalaVersion(version: String): Unit = scalaVersionComboBox.setSelectedItemEnsuring(version)
5452
@TestOnly override private[project] def setSbtVersion(version: String): Unit =
5553
sbtVersionComboBox.setSelectedItemEnsuring(version)
5654
@TestOnly override private[project] def setPackagePrefix(prefix: String): Unit =
@@ -72,7 +70,6 @@ final class ZioNewProjectWizardStep(parent: ScalaNewProjectWizardMultiStep)
7270

7371
locally {
7472
getData.putUserData(SbtScalaNewProjectWizardData.KEY, this)
75-
getData.putUserData(ScalaGitNewProjectWizardData.KEY, this)
7673
getData.putUserData(ScalaSampleCodeNewProjectWizardData.KEY, this)
7774
}
7875

@@ -92,11 +89,10 @@ final class ZioNewProjectWizardStep(parent: ScalaNewProjectWizardMultiStep)
9289
)
9390
}
9491

95-
override protected def _addScalaSampleCode(project: Project, projectRoot: Path): Seq[VirtualFile] = {
92+
override protected def _addScalaSampleCode(project: Project, projectRoot: Path): Seq[VirtualFile] =
9693
// TODO migrate to the new Sample Code templates (with rendered onboarding tips)
9794
// For now, this is handled (*sigh* hardcoded) in the ZioProjectBuilder
9895
Seq.empty
99-
}
10096

10197
override def setupUI(panel: Panel): Unit = {
10298
panel.row(
@@ -169,17 +165,30 @@ final class ZioNewProjectWizardStep(parent: ScalaNewProjectWizardMultiStep)
169165
initSelectionsAndUi(getContext.getDisposable)
170166
}
171167

172-
override protected def setUpSampleCode(panel: Panel): Unit = {
173-
panel.row(null: JLabel, (row: Row) => {
174-
val cb = row.checkBox("""Create a "Hello World" main app""")
175-
ButtonKt.bindSelected(cb, addSampleCodeProperty: com.intellij.openapi.observable.properties.ObservableMutableProperty[java.lang.Boolean])
176-
ButtonKt.whenStateChangedFromUi(cb, null, value => {
177-
BSLog.logAddSampleCodeChanged(parent, value): @nowarn("cat=deprecation")
178-
KUnit
179-
})
180-
KUnit
181-
}).topGap(TopGap.SMALL)
182-
}
168+
override protected def setUpSampleCode(panel: Panel): Unit =
169+
panel
170+
.row(
171+
null: JLabel,
172+
(row: Row) => {
173+
val cb = row.checkBox("""Create a "Hello World" main app""")
174+
ButtonKt.bindSelected(
175+
cb,
176+
addSampleCodeProperty: com.intellij.openapi.observable.properties.ObservableMutableProperty[
177+
java.lang.Boolean
178+
]
179+
)
180+
ButtonKt.whenStateChangedFromUi(
181+
cb,
182+
null,
183+
value => {
184+
BSLog.logAddSampleCodeChanged(parent, value): @nowarn("cat=deprecation")
185+
KUnit
186+
}
187+
)
188+
KUnit
189+
}
190+
)
191+
.topGap(TopGap.SMALL)
183192

184193
private def validateModuleName(builder: ValidationInfoBuilder, field: JBTextField): ValidationInfo = {
185194
val moduleName = field.getText

0 commit comments

Comments
 (0)