Skip to content

Commit

Permalink
Upadated to a new Maven version.
Browse files Browse the repository at this point in the history
  • Loading branch information
sergeyCodenameOne committed Aug 15, 2021
1 parent 997f155 commit 8b8d82d
Show file tree
Hide file tree
Showing 147 changed files with 2,610 additions and 5,681 deletions.
4 changes: 2 additions & 2 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

219 changes: 173 additions & 46 deletions .idea/workspace.xml

Large diffs are not rendered by default.

209 changes: 209 additions & 0 deletions android/target/codenameone/antProject/build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--build_version=5.3-->
<!--
This the Ant build script used by the CN1BuildMojo for sending to the build server.
-->

<project name="SampleProjectTemplate" default="default" basedir="." xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1">
<description>Builds, tests, and runs the project SampleProjectTemplate.</description>

<property file="${codenameone_settings.properties}"/>
<property name="automated" value="false" />
<taskdef name="codeNameOne" classname="com.codename1.build.client.CodeNameOneBuildTask" classpath="${CodeNameOneBuildClient.jar}"/>




<target name="ios-device" depends="">
<property name="ios.debug.targetType" value="iphone"/>
<echo message="Building iOS for target ${ios.debug.targetType}"/>
<codeNameOne
jarFile="${dist.jar}"
displayName="${codename1.displayName}"
packageName = "${codename1.packageName}"
mainClassName = "${codename1.mainName}"
version="${codename1.version}"
icon="${codename1.icon}"
vendor="${codename1.vendor}"
subtitle="${codename1.secondaryTitle}"

targetType="${ios.debug.targetType}"
certificate="${codename1.ios.debug.certificate}"
certPassword="${codename1.ios.debug.certificatePassword}"
provisioningProfile="${codename1.ios.debug.provision}"
appid="${codename1.ios.appid}"
automated="${automated}"
/>
</target>


<target name="ios-device-release" depends="">
<property name="ios.release.targetType" value="iphone"/>
<codeNameOne
jarFile="${dist.jar}"
displayName="${codename1.displayName}"
packageName = "${codename1.packageName}"
mainClassName = "${codename1.mainName}"
version="${codename1.version}"
icon="${codename1.icon}"
vendor="${codename1.vendor}"
subtitle="${codename1.secondaryTitle}"
appStoreBuild="true"
production="true"
targetType="${ios.release.targetType}"
certificate="${codename1.ios.release.certificate}"
certPassword="${codename1.ios.release.certificatePassword}"
provisioningProfile="${codename1.ios.release.provision}"
appid="${codename1.ios.appid}"
automated="${automated}"
/>
</target>



<target name="android-device" depends="">
<property name="android.targetType" value="android"/>
<codeNameOne
jarFile="${dist.jar}"
displayName="${codename1.displayName}"
packageName = "${codename1.packageName}"
mainClassName = "${codename1.mainName}"
version="${codename1.version}"
icon="${codename1.icon}"
vendor="${codename1.vendor}"
subtitle="${codename1.secondaryTitle}"

targetType="${android.targetType}"
keystoreAlias="${codename1.android.keystoreAlias}"
keystore="${codename1.android.keystore}"
certPassword="${codename1.android.keystorePassword}"
automated="${automated}"
/>
</target>

<target name="javascript" depends="">
<property name="javascript.targetType" value="javascript"/>
<echo message="Building iOS for target ${javascript.targetType}"/>
<codeNameOne
jarFile="${dist.jar}"
displayName="${codename1.displayName}"
packageName = "${codename1.packageName}"
mainClassName = "${codename1.mainName}"
version="${codename1.version}"
icon="${codename1.icon}"
vendor="${codename1.vendor}"
subtitle="${codename1.secondaryTitle}"

targetType="${javascript.targetType}"
automated="${automated}"
/>
</target>

<target name="war" depends="" description="Create .war file with Javascript build">
<antcall target="build-for-javascript">
<param name="automated" value="true"/>
</antcall>
<basename property="dist.base" file="${dist.jar}" suffix=".jar"/>
<property name="dist.war" value="dist/${dist.base}.war"/>
<mkdir dir="build/result" />
<unzip src="dist/result.zip" dest="build/result" />
<first id="first">
<fileset dir="build/result" includes="*.war"/>
</first>
<copy file="${toString:first}" tofile="${dist.war}" overwrite="true"/>
<delete dir="build/result"/>
<delete file="dist/result.zip"/>
</target>
<target name="check-webapp-runner">
<echo>Checking Webapp Runner...</echo>
<available file="${user.home}/.codenameone/webapp-runner.jar" property="webapprunner.present" value="true"/>
<echo message="Webapp Runner present? : ${webapprunner.present}"/>
</target>
<target name="init-webapp-runner" depends="check-webapp-runner" unless="webapprunner.present">
<mkdir dir="${user.home}/.codenameone"/>
<get src="https://github.com/codenameone/cn1-binaries/raw/master/javascript/webapp-runner.jar" dest="${user.home}/.codenameone/webapp-runner.jar"/>
</target>
<target name="check-war" depends="">
<echo>Checking War</echo>
<basename property="dist.base" file="${dist.jar}" suffix=".jar"/>
<property name="dist.war" value="dist/${dist.base}.war"/>
<available file="${dist.war}" property="war.present" value="true"/>
<echo message="War file present? ${war.present}"/>
</target>
<target name="init-war" depends="check-war" unless="war.present">
<antcall target="war"/>
</target>
<target name="run-war" depends="init-war,init-webapp-runner" description="Run as Web App on Localhost using embedded Tomcat">
<property name="port" value="0"/>
<java jar="${user.home}/.codenameone/webapp-runner.jar" fork="true" failonerror="true">
<arg value="${dist.war}"/>
<arg value="--port"/>
<arg value="${port}"/>
<arg value="--open-in-browser"/>
<arg value="--temp-directory"/>
<arg value="dist/webapp"/>
</java>
</target>


<target name="mac-os-x-desktop" depends="">
<property name="desktop_macosx.targetType" value="desktop_macosx"/>
<codeNameOne
jarFile="${dist.jar}"
displayName="${codename1.displayName}"
packageName = "${codename1.packageName}"
mainClassName = "${codename1.mainName}"
version="${codename1.version}"
icon="${codename1.icon}"
vendor="${codename1.vendor}"
subtitle="${codename1.secondaryTitle}"
certificate="${codename1.desktop.mac.certificate}"
certPassword="${codename1.desktop.mac.certificatePassword}"
targetType="${desktop_macosx.targetType}"
automated="${automated}"
/>

</target>

<target name="windows-desktop" depends="">
<property name="desktop_windows.targetType" value="desktop_windows"/>
<codeNameOne
jarFile="${dist.jar}"
displayName="${codename1.displayName}"
packageName = "${codename1.packageName}"
mainClassName = "${codename1.mainName}"
version="${codename1.version}"
icon="${codename1.icon}"
vendor="${codename1.vendor}"
subtitle="${codename1.secondaryTitle}"

targetType="${desktop_windows.targetType}"
automated="${automated}"
/>

</target>




<target name="windows-device" depends="">
<codeNameOne
jarFile="${dist.jar}"
displayName="${codename1.displayName}"
packageName = "${codename1.packageName}"
mainClassName = "${codename1.mainName}"
version="${codename1.version}"
icon="${codename1.icon}"
vendor="${codename1.vendor}"
subtitle="${codename1.secondaryTitle}"

certificate="${codename1.windows.certificate}"
certPassword="${codename1.windows.certificatePassword}"

targetType="windows"
automated="${automated}"
/>
</target>


</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
codename1.android.keystore=
codename1.android.keystoreAlias=
codename1.android.keystorePassword=
codename1.arg.hyp.beamId=82b4aa27-25f2-4dc8-9fdd-0975de90af27
codename1.arg.ios.newStorageLocation=true
codename1.arg.java.version=8
codename1.arg.maven.codenameone-core.version=7.0.36
codename1.arg.maven.codenameone-maven-plugin=7.0.36
codename1.cssTheme=true
codename1.displayName=Grub
codename1.icon=icon.png
codename1.ios.appid=Q5GHSKAL2F.com.codename1.demos.grub
codename1.ios.certificate=
codename1.ios.certificatePassword=
codename1.ios.debug.certificate=
codename1.ios.debug.certificatePassword=
codename1.ios.debug.provision=
codename1.ios.provision=
codename1.ios.release.certificate=
codename1.ios.release.certificatePassword=
codename1.ios.release.provision=
codename1.j2me.nativeTheme=nbproject/nativej2me.res
codename1.kotlin=false
codename1.languageLevel=5
codename1.mainName=Grub
codename1.packageName=com.codename1.demos.grub
codename1.rim.certificatePassword=
codename1.rim.signtoolCsk=
codename1.rim.signtoolDb=
codename1.secondaryTitle=Hello World
codename1.vendor=CodenameOne
codename1.version=1.0
Binary file not shown.
Binary file added android/target/codenameone/antProject/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file added android/target/grub-android-1.0-SNAPSHOT.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions android/target/maven-archiver/pom.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#Generated by Maven
#Sun Aug 15 16:06:30 IDT 2021
groupId=com.codename1.demos.grub
artifactId=grub-android
version=1.0-SNAPSHOT
Binary file added cn1libs/CodeRAD.cn1lib
Binary file not shown.
1 change: 1 addition & 0 deletions cn1libs/CodeRAD.ver
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
version=13
Binary file modified cn1libs/CodeRAD/jars/main.zip
Binary file not shown.
Binary file added common/CodeNameOneBuildClient.jar
Binary file not shown.
Binary file added common/JavaSE.jar
Binary file not shown.
7 changes: 0 additions & 7 deletions common/Versions.properties

This file was deleted.

3 changes: 0 additions & 3 deletions common/codenameone_kotlin.properties

This file was deleted.

51 changes: 22 additions & 29 deletions common/codenameone_settings.properties
Original file line number Diff line number Diff line change
@@ -1,36 +1,29 @@
#
#Thu Apr 15 13:28:36 IDT 2021
codename1.vendor=CodenameOne
codename1.displayName=Grub
codename1.icon=icon.png
codename1.arg.java.version=8
codename1.languageLevel=5
codename1.ios.debug.certificatePassword=
codename1.arg.android.multidex=true
codename1.secondaryTitle=Grub
codename1.version=1.0
package=generated
codename1.mainName=Grub
codename1.ios.certificatePassword=
codename1.ios.release.provision=
codename1.android.keystore=
codename1.android.keystoreAlias=
codename1.android.keystorePassword=
codename1.arg.ios.newStorageLocation=true
codename1.rim.signtoolDb=
codename1.arg.java.version=8
codename1.cssTheme=true
codename1.ios.release.certificatePassword=
codename1.ios.certificate=
userClass=src/userclasses/StateMachine.java
codename1.android.keystorePassword=
codename1.displayName=Grub
codename1.icon=icon.png
codename1.ios.appid=Q5GHSKAL2F.com.codename1.demos.grub
codename1.ios.release.certificate=
codename1.j2me.nativeTheme=nbproject/nativej2me.res
codename1.rim.signtoolCsk=
codename1.ios.certificate=
codename1.ios.certificatePassword=
codename1.ios.debug.certificate=
mainForm=Main
codename1.android.keystore=
baseClass=src/generated/StateMachineBase.java
guiResource=theme.res
codename1.android.keystoreAlias=
codename1.rim.certificatePassword=
codename1.ios.debug.certificatePassword=
codename1.ios.debug.provision=
codename1.ios.provision=
codename1.ios.release.certificate=
codename1.ios.release.certificatePassword=
codename1.ios.release.provision=
codename1.j2me.nativeTheme=nbproject/nativej2me.res
codename1.kotlin=false
codename1.languageLevel=5
codename1.mainName=Grub
codename1.packageName=com.codename1.demos.grub
codename1.rim.certificatePassword=
codename1.rim.signtoolCsk=
codename1.rim.signtoolDb=
codename1.secondaryTitle=Hello World
codename1.vendor=CodenameOne
codename1.version=1.0
4 changes: 2 additions & 2 deletions common/grub-common.iml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/CodeRAD" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.codenameone:codenameone-core:7.0.23" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.codenameone:codenameone-core:7.0.36" level="project" />
<orderEntry type="module" module-name="grub-CodeRAD" />
<orderEntry type="library" name="Maven: ATTACHED-JAR: com.codename1.demos.grub:grub-CodeRAD:common:1.0-SNAPSHOT" level="project" />
</component>
Expand Down
Loading

0 comments on commit 8b8d82d

Please sign in to comment.