Skip to content

Commit

Permalink
update intellij version
Browse files Browse the repository at this point in the history
  • Loading branch information
q-williamcarter committed Sep 11, 2019
1 parent f331776 commit 1988606
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
8 changes: 5 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
organization in ThisBuild := "org.jetbrains"

version in ThisBuild := "0.3.8"
version in ThisBuild := "0.3.11"

scalaVersion in ThisBuild := "2.12.6"

ideaBuild in ThisBuild := "182.4323.6"
//ideaBuild in ThisBuild := "182.4323.6"
ideaBuild in ThisBuild := "192.6603.28"

ideaPluginName in ThisBuild := "library-test-ijext"

Expand All @@ -16,7 +17,8 @@ lazy val library = project.in(file("library")).settings(
lazy val support = project.in(file("ijext")).dependsOn(library).settings(
name := "library-test-ijext",
ideaExternalPlugins += IdeaPlugin.Id("Scala", "org.intellij.scala", None),
).aggregate(library)
scalacOptions += "-Ylog-classpath"
).aggregate(library).enablePlugins(SbtIdeaPlugin)

lazy val testProject = project.in(file("test-project"))
.settings(
Expand Down
4 changes: 2 additions & 2 deletions ijext/src/main/resources/META-INF/intellij-compat.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<name>Library test support</name>
<id>ibextensions.test</id>
<description>This provides dummy support for testing</description>
<version>0.3.8</version>
<version>0.3.11</version>
<vendor>JetBrains</vendor>
<ideaVersion since-build="2018.1.0" until-build="2018.4.0">
<ideaVersion since-build="2019.2.0" until-build="2019.2.3">
<extension interface="org.jetbrains.plugins.scala.lang.macros.evaluator.ScalaMacroTypeable"
implementation="org.jetbrains.scala.libextensions.test.MacroFooableSupport">
<description>Support for genFoo macro</description>
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/resources/META-INF/intellij-compat.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"artifact": "org.jetbrains % library-test-ijext_2.12 % 0.3.8"
"artifact": "org.jetbrains % library-test-ijext_2.12 % 0.3.11"
}
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "2.2.4")
addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "2.4.1")

addSbtPlugin("com.dwijnand" % "sbt-dynver" % "2.0.0")

0 comments on commit 1988606

Please sign in to comment.