Skip to content

fix typo in cleaning / uninstall kotlin extension+ use default de.hybris.ant.taskdefs.YJavaC since it extends org.apache.tools.ant.taskdefs.Javac #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix typo in cleaning / uninstall kotlin extension+ use default de.hybris.ant.taskdefs.YJavaC since it extends org.apache.tools.ant.taskdefs.Javac #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d538f4
fix typo in cleaning / uninstall kotlin extension+ use default de.hyb…
alaaomri Apr 4, 2025
7ec6386
improve fix
alaaomri Apr 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions buildcallbacks.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,23 +108,27 @@ In this mode Kotlin classes will have visibility to Java classes and vice-versa
</replace>
<replace file="${HYBRIS_BIN_DIR}/platform/resources/ant/compiling.xml">
<replacetoken><![CDATA[<include name="src" />]]></replacetoken>
<replacevalue><![CDATA[<include name="src"/><include name="kotlinsrc"/>]]></replacevalue>
<replacevalue><![CDATA[<include name="src" /><include name="kotlinsrc" />]]></replacevalue>
</replace>
<replace file="${HYBRIS_BIN_DIR}/platform/resources/ant/compiling.xml">
<replacetoken><![CDATA[<include name="src/**" />]]></replacetoken>
<replacevalue><![CDATA[<include name="src/**" /><include name="kotlinsrc/**" />]]></replacevalue>
</replace>
<replace file="${HYBRIS_BIN_DIR}/platform/resources/ant/compiling.xml">
<replacetoken><![CDATA[<include name="testsrc" />]]></replacetoken>
<replacevalue><![CDATA[<include name="testsrc"/><include name="kotlintestsrc"/>]]></replacevalue>
<replacevalue><![CDATA[<include name="testsrc" /><include name="kotlintestsrc" />]]></replacevalue>
</replace>
<replace file="${HYBRIS_BIN_DIR}/platform/resources/ant/compiling.xml">
<replacetoken><![CDATA[<include name="src/**/*.java" />]]></replacetoken>
<replacevalue><![CDATA[<include name="src/**/*.java"/><include name="kotlinsrc/**/*.kt" />]]></replacevalue>
<replacevalue><![CDATA[<include name="src/**/*.java" /><include name="kotlinsrc/**/*.kt" />]]></replacevalue>
</replace>
<replace file="${HYBRIS_BIN_DIR}/platform/resources/ant/compiling.xml">
<replacetoken><![CDATA[<include name="testsrc/**" />]]></replacetoken>
<replacevalue><![CDATA[<include name="testsrc/**"/><include name="kotlintestsrc/**" />]]></replacevalue>
<replacevalue><![CDATA[<include name="testsrc/**" /><include name="kotlintestsrc/**" />]]></replacevalue>
</replace>
<replace file="${HYBRIS_BIN_DIR}/platform/resources/ant/util.xml">
<replacetoken><![CDATA[<compilerarg line="${standalone.jdkmodulesexports}"/>]]></replacetoken>
<replacevalue><![CDATA[<withKotlin/><compilerarg line="${standalone.jdkmodulesexports}" />]]></replacevalue>
<replacevalue><![CDATA[<withKotlin/><compilerarg line="${standalone.jdkmodulesexports}"/>]]></replacevalue>
</replace>
<replaceregexp file="${ext.kotlinnature.path}/project.properties"
match="^#build\.compiler=modern$"
Expand All @@ -144,23 +148,27 @@ In this mode Kotlin classes will have visibility to Java classes and vice-versa
<replacevalue><![CDATA[<taskdef name="yjavac" classname="de.hybris.ant.taskdefs.YJavaC">]]></replacevalue>
</replace>
<replace file="${HYBRIS_BIN_DIR}/platform/resources/ant/compiling.xml">
<replacetoken><![CDATA[<include name="src"/><include name="kotlinsrc"/>]]></replacetoken>
<replacetoken><![CDATA[<include name="src" /><include name="kotlinsrc" />]]></replacetoken>
<replacevalue><![CDATA[<include name="src" />]]></replacevalue>
</replace>
<replace file="${HYBRIS_BIN_DIR}/platform/resources/ant/compiling.xml">
<replacetoken><![CDATA[<include name="testsrc"/><include name="kotlintestsrc"/>]]></replacetoken>
<replacetoken><![CDATA[<include name="src/**" /><include name="kotlinsrc/**" />]]></replacetoken>
<replacevalue><![CDATA[<include name="src/**" />]]></replacevalue>
</replace>
<replace file="${HYBRIS_BIN_DIR}/platform/resources/ant/compiling.xml">
<replacetoken><![CDATA[<include name="testsrc" /><include name="kotlintestsrc" />]]></replacetoken>
<replacevalue><![CDATA[<include name="testsrc" />]]></replacevalue>
</replace>
<replace file="${HYBRIS_BIN_DIR}/platform/resources/ant/compiling.xml">
<replacetoken><![CDATA[<include name="src/**/*.java"/><include name="kotlinsrc/**/*.kt" />]]></replacetoken>
<replacetoken><![CDATA[<include name="src/**/*.java" /><include name="kotlinsrc/**/*.kt" />]]></replacetoken>
<replacevalue><![CDATA[<include name="src/**/*.java" />]]></replacevalue>
</replace>
<replace file="${HYBRIS_BIN_DIR}/platform/resources/ant/compiling.xml">
<replacetoken><![CDATA[<include name="testsrc/**"/><include name="kotlintestsrc/**/*.kt" />]]></replacetoken>
<replacetoken><![CDATA[<include name="testsrc/**" /><include name="kotlintestsrc/**" />]]></replacetoken>
<replacevalue><![CDATA[<include name="testsrc/**" />]]></replacevalue>
</replace>
<replace file="${HYBRIS_BIN_DIR}/platform/resources/ant/util.xml">
<replacetoken><![CDATA[<withKotlin/><compilerarg line="${standalone.jdkmodulesexports}" />]]></replacetoken>
<replacetoken><![CDATA[<withKotlin/><compilerarg line="${standalone.jdkmodulesexports}"/>]]></replacetoken>
<replacevalue><![CDATA[<compilerarg line="${standalone.jdkmodulesexports}"/>]]></replacevalue>
</replace>
<replaceregexp file="${ext.kotlinnature.path}/project.properties"
Expand Down