Skip to content

Commit

Permalink
Merge pull request #537 from JetBrains/feature/enforce-not-null-with-…
Browse files Browse the repository at this point in the history 
…javac2

[breaking] Enforce @NotNull annotations at runtime
  • Loading branch information
@sergej-koscejev
sergej-koscejev authored Nov 7, 2023
2 parents 14cfc2d + 7914332 commit ae345cb
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 48 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ model-api/build
code/model-api/org.modelix.model.api/lib
scripts/.mps-caches
.idea/modules

# Generated during the build
/kotlin-js-store/
58 changes: 22 additions & 36 deletions .../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
<concept id="927724900262033858" name="jetbrains.mps.build.structure.BuildSource_JavaOptions" flags="ng" index="2_Ic$z">
<property id="927724900262033861" name="generateDebugInfo" index="2_Ic$$" />
<property id="6998860900671147996" name="javaLevel" index="TZNOO" />
<property id="2059109515400425365" name="compiler" index="3fwGa$" />
</concept>
<concept id="2750015747481074431" name="jetbrains.mps.build.structure.BuildLayout_Files" flags="ng" index="2HvfSZ">
<child id="2750015747481074432" name="path" index="2HvfZ0" />
Expand All @@ -72,10 +73,6 @@
<reference id="2591537044435828006" name="module" index="Saw0g" />
</concept>
<concept id="6647099934206700647" name="jetbrains.mps.build.structure.BuildJavaPlugin" flags="ng" index="10PD9b" />
<concept id="7181125477683417252" name="jetbrains.mps.build.structure.BuildExternalLayoutDependency" flags="ng" index="13uUGR">
<reference id="7181125477683417255" name="layout" index="13uUGO" />
<child id="7181125477683417254" name="artifacts" index="13uUGP" />
</concept>
<concept id="7389400916848050074" name="jetbrains.mps.build.structure.BuildLayout_Jar" flags="ng" index="3981dx" />
<concept id="7389400916848050060" name="jetbrains.mps.build.structure.BuildLayout_NamedContainer" flags="ng" index="3981dR">
<child id="4380385936562148502" name="containerName" index="Nbhlr" />
Expand Down Expand Up @@ -565,7 +562,7 @@
<node concept="398BVA" id="3xFG3bj5MkQ" role="3LXTmr">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="3xFG3bj5MkR" role="iGT6I">
<property role="2Ry0Am" value="mps-hacks" />
<property role="2Ry0Am" value="hacks" />
<node concept="2Ry0Ak" id="3xFG3bj5MkS" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3xFG3bj5MkT" role="2Ry0An">
Expand Down Expand Up @@ -14121,6 +14118,7 @@
<node concept="2_Ic$z" id="5KXebfcSw7" role="3989C9">
<property role="2_Ic$$" value="true" />
<property role="TZNOO" value="11" />
<property role="3fwGa$" value="IntelliJ" />
</node>
<node concept="1wNqPr" id="2B1T7v1mPNt" role="3989C9">
<property role="1wNuhc" value="true" />
Expand All @@ -14135,6 +14133,12 @@
<property role="TrG5h" value="mps.home" />
<node concept="55IIr" id="4be$WTb2x9Y" role="398pKh" />
</node>
<node concept="398rNT" id="3UyIjdU0AZ4" role="1l3spd">
<property role="TrG5h" value="idea_home" />
<node concept="398BVA" id="3UyIjdU0Bj_" role="398pKh">
<ref role="398BVh" node="2Xjt3l56m0Y" resolve="mps.home" />
</node>
</node>
<node concept="398rNT" id="2fo8bJE$D4o" role="1l3spd">
<property role="TrG5h" value="extensions.home" />
<node concept="55IIr" id="42yR2aTbxQd" role="398pKh">
Expand Down Expand Up @@ -14183,18 +14187,6 @@
<ref role="398BVh" node="2Xjt3l56m0Y" resolve="mps.home" />
</node>
</node>
<node concept="13uUGR" id="6aQMI6nH4L1" role="1l3spa">
<ref role="13uUGO" to="ffeo:6eCuTcwOnJO" resolve="IDEA" />
<node concept="398BVA" id="6aQMI6nH4VT" role="13uUGP">
<ref role="398BVh" node="2Xjt3l56m0Y" resolve="mps.home" />
</node>
</node>
<node concept="2sgV4H" id="6aQMI6nHNaz" role="1l3spa">
<ref role="1l3spb" to="ffeo:6S1jmf0xDFC" resolve="mpsBootstrapCore" />
<node concept="398BVA" id="6aQMI6nHNlt" role="2JcizS">
<ref role="398BVh" node="2Xjt3l56m0Y" resolve="mps.home" />
</node>
</node>
<node concept="1l3spV" id="2Xjt3l56m3c" role="1l3spN">
<node concept="m$_wl" id="F1NWDqrBeT" role="39821P">
<ref role="m_rDy" node="F1NWDqr5lJ" resolve="de.itemis.mps.grammarcells" />
Expand Down Expand Up @@ -14236,6 +14228,10 @@
<ref role="m_rDy" node="2H_mjOXw1Ef" resolve="de.itemis.mps.nativelibs" />
<node concept="pUk6x" id="3D0nl1ssJJG" role="pUk7w" />
</node>
<node concept="m$_wl" id="3UyIjdU0jjv" role="39821P">
<ref role="m_rDy" node="2H_mjOXwfJy" resolve="de.itemis.mps.nativelibs.loader" />
<node concept="pUk6x" id="3UyIjdU0jzs" role="pUk7w" />
</node>
<node concept="398223" id="6aQMI6nGnZ6" role="39821P">
<node concept="398223" id="2$Uje8rsx54" role="39821P">
<node concept="3_J27D" id="2$Uje8rsx55" role="Nbhlr">
Expand Down Expand Up @@ -14566,7 +14562,8 @@
<property role="TrG5h" value="tests" />
<node concept="2_Ic$z" id="6$6tsX_CF79" role="3989C9">
<property role="2_Ic$$" value="true" />
<property role="TZNOO" value="1.8" />
<property role="TZNOO" value="11" />
<property role="3fwGa$" value="IntelliJ" />
</node>
<node concept="1wNqPr" id="6$6tsX_CF7a" role="3989C9">
<property role="1wNuhc" value="true" />
Expand Down Expand Up @@ -16968,6 +16965,7 @@
<property role="BnDLt" value="true" />
<property role="TrG5h" value="test.org.modelix.model.mpsadapters" />
<property role="3LESm3" value="133bdd06-b98b-47f5-8335-a48e447f9c41" />
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
<node concept="398BVA" id="7g5FWGK0KzA" role="3LF7KH">
<ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
<node concept="2Ry0Ak" id="7g5FWGK0KzG" role="iGT6I">
Expand Down Expand Up @@ -19440,6 +19438,12 @@
<property role="TrG5h" value="mps.home" />
<node concept="55IIr" id="1QLFoGON26t" role="398pKh" />
</node>
<node concept="398rNT" id="3UyIjdU0SMh" role="1l3spd">
<property role="TrG5h" value="idea_home" />
<node concept="398BVA" id="3UyIjdU0SMV" role="398pKh">
<ref role="398BVh" node="6$6tsX_CF7d" resolve="mps.home" />
</node>
</node>
<node concept="398rNT" id="1QLFoGON23s" role="1l3spd">
<property role="TrG5h" value="extensions.home" />
<node concept="55IIr" id="1QLFoGON23t" role="398pKh">
Expand Down Expand Up @@ -19556,24 +19560,6 @@
<ref role="398BVh" node="6$6tsX_CF7d" resolve="mps.home" />
</node>
</node>
<node concept="2sgV4H" id="6yXTMcTQu49" role="1l3spa">
<ref role="1l3spb" to="ffeo:ymnOULAEsd" resolve="mpsTesting" />
<node concept="398BVA" id="6yXTMcTQu6h" role="2JcizS">
<ref role="398BVh" node="6$6tsX_CF7d" resolve="mps.home" />
</node>
</node>
<node concept="13uUGR" id="6$6tsX_CF7r" role="1l3spa">
<ref role="13uUGO" to="ffeo:6eCuTcwOnJO" resolve="IDEA" />
<node concept="398BVA" id="6$6tsX_CF7s" role="13uUGP">
<ref role="398BVh" node="6$6tsX_CF7d" resolve="mps.home" />
</node>
</node>
<node concept="2sgV4H" id="6$6tsX_CF7t" role="1l3spa">
<ref role="1l3spb" to="ffeo:6S1jmf0xDFC" resolve="mpsBootstrapCore" />
<node concept="398BVA" id="6$6tsX_CF7u" role="2JcizS">
<ref role="398BVh" node="6$6tsX_CF7d" resolve="mps.home" />
</node>
</node>
<node concept="2sgV4H" id="6$6tsX_CIho" role="1l3spa">
<ref role="1l3spb" node="2Xjt3l56m0V" resolve="de.itemis.mps.extensions" />
<node concept="398BVA" id="2fo8bJECJBq" role="2JcizS">
Expand Down
13 changes: 1 addition & 12 deletions ...ix.model.mpsadapters/models/[email protected]
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1608,17 +1608,6 @@
</node>
</node>
</node>
<node concept="3vlDli" id="5pW4zr_0kLZ" role="3cqZAp">
<node concept="3cmrfG" id="5pW4zr_0kM0" role="3tpDZB">
<property role="3cmrfH" value="22" />
</node>
<node concept="2OqwBi" id="5pW4zr_0kM1" role="3tpDZA">
<node concept="37vLTw" id="5pW4zr_0kM2" role="2Oq$k0">
<ref role="3cqZAo" node="5pW4zr_0kLH" resolve="children" />
</node>
<node concept="34oBXx" id="5pW4zr_0kM3" role="2OqNvi" />
</node>
</node>
<node concept="3clFbH" id="1IQakYaqhdT" role="3cqZAp" />
<node concept="3vlDli" id="5pW4zr_0BV2" role="3cqZAp">
<node concept="2OqwBi" id="5pW4zr_0U_N" role="3tpDZA">
Expand Down Expand Up @@ -1699,7 +1688,7 @@
<node concept="34oBXx" id="5pW4zr_0W6b" role="2OqNvi" />
</node>
<node concept="3cmrfG" id="5pW4zr_0FGT" role="3tpDZB">
<property role="3cmrfH" value="13" />
<property role="3cmrfH" value="12" />
</node>
</node>
<node concept="3clFbH" id="5pW4zr_0kM4" role="3cqZAp" />
Expand Down

0 comments on commit ae345cb

Please sign in to comment.