Skip to content

Commit 6591e62

Browse files
author
Chidi Okwudire
committed
Updated to Java 8
1 parent a78b458 commit 6591e62

14 files changed

+25
-26
lines changed

build.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
code size and wider device support</echo>
2323
<mkdir dir="build/tmp"/>
2424
<javac destdir="build/tmp"
25-
source="1.5"
26-
target="1.5"
25+
source="1.8"
26+
target="1.8"
2727
bootclasspath="lib/CLDC11.jar"
2828
classpath="${javac.classpath}:${build.classes.dir}">
2929
<src path="${src.dir}"/>
@@ -32,8 +32,8 @@
3232

3333

3434
<target name="-pre-init">
35-
<property name="javac.source" value="1.5" />
36-
<property name="javac.target" value="1.5" />
35+
<property name="javac.source" value="1.8" />
36+
<property name="javac.target" value="1.8" />
3737
</target>
3838

3939
<target name="run">

dist/lib/CLDC11.jar

36.7 KB
Binary file not shown.

dist/lib/JavaSE.jar

-4.99 MB
Binary file not shown.

lib/CLDC11.jar

36.7 KB
Binary file not shown.

nbproject/project.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ annotation.processing.processors.list=
44
annotation.processing.run.all.processors=true
55
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
66
application.title=parse4cn1
7-
application.vendor=Codename One
7+
application.vendor=SMash ICT Solutions
8+
auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
89
build.classes.dir=${build.dir}/classes
910
build.classes.excludes=**/*.java,**/*.form
1011
# This directory is removed when the project is cleaned:
683 Bytes
Binary file not shown.

test/CN1TestApp/JavaSE.jar

-4.99 MB
Binary file not shown.

test/CN1TestApp/build.xml

+15-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--build_version=2.9-->
2+
<!--build_version=3.1-->
3+
<!--
4+
This build script was generated by Codename One to build native mobile applications using Java.
5+
To learn more about Codename One go to https://www.codenameone.com/
6+
-->
37

48
<project name="parse4cn1TestApp" default="default" basedir=".">
59
<description>Builds, tests, and runs the project parse4cn1TestApp.</description>
@@ -13,6 +17,7 @@
1317

1418
<target depends="init,compile,jar" name="compile-test">
1519
<mkdir dir="${build.test.classes.dir}" />
20+
<mkdir dir="${test.src.dir}" />
1621
<javac destdir="${build.test.classes.dir}"
1722
encoding="${source.encoding}"
1823
source="1.5"
@@ -83,9 +88,9 @@
8388
/>
8489
</target>
8590

86-
<target name="test-for-ios-device" depends="clean,copy-ios-override,copy-libs,jar,clean-override">
91+
<target name="test-for-ios-device" depends="clean,copy-ios-override,copy-libs,compile-test,clean-override">
8792
<codeNameOne
88-
jarFile="${dist.jar}"
93+
jarFile="dist/unitTests.jar"
8994
displayName="${codename1.displayName}"
9095
packageName = "${codename1.packageName}"
9196
mainClassName = "${codename1.mainName}"
@@ -102,9 +107,9 @@
102107
/>
103108
</target>
104109

105-
<target name="test-for-android-device" depends="clean,copy-android-override,copy-libs,jar,clean-override">
110+
<target name="test-for-android-device" depends="clean,copy-android-override,copy-libs,compile-test,clean-override">
106111
<codeNameOne
107-
jarFile="${dist.jar}"
112+
jarFile="dist/unitTests.jar"
108113
displayName="${codename1.displayName}"
109114
packageName = "${codename1.packageName}"
110115
mainClassName = "${codename1.mainName}"
@@ -120,9 +125,9 @@
120125
/>
121126
</target>
122127

123-
<target name="test-for-rim-device" depends="clean,copy-rim-override,copy-libs,jar,clean-override">
128+
<target name="test-for-rim-device" depends="clean,copy-rim-override,copy-libs,compile-test,clean-override">
124129
<codeNameOne
125-
jarFile="${dist.jar}"
130+
jarFile="dist/unitTests.jar"
126131
displayName="${codename1.displayName}"
127132
packageName = "${codename1.packageName}"
128133
mainClassName = "${codename1.mainName}"
@@ -141,9 +146,9 @@
141146
</delete>
142147
</target>
143148

144-
<target name="test-for-j2me-device" depends="clean,j2me-native-theme-init,copy-j2me-native,copy-j2me-override,copy-libs,jar,clean-j2me-native,clean-override">
149+
<target name="test-for-j2me-device" depends="clean,j2me-native-theme-init,copy-j2me-native,copy-j2me-override,copy-libs,compile-test,clean-j2me-native,clean-override">
145150
<codeNameOne
146-
jarFile="${dist.jar}"
151+
jarFile="dist/unitTests.jar"
147152
displayName="${codename1.displayName}"
148153
packageName = "${codename1.packageName}"
149154
mainClassName = "${codename1.mainName}"
@@ -434,18 +439,10 @@
434439
classpath="${javac.classpath}:${build.classes.dir}">
435440
<src path="native/javase"/>
436441
<src path="lib/impl/native/javase"/>
437-
</javac>
438-
439-
<!-- [parse4cn1] Included copying of parse4cn1.cn1lib -->
440-
<copy file="../../dist/parse4cn1.cn1lib" todir="lib" failonerror="true" overwrite="true"/>
441-
442-
<!-- [parse4cn1] Refresh project libs so the newly copied lib is used; doesn't seem to work though
443-
and not sure why. For now, we refresh the normal way via the GUI -->
444-
<!-- <antcall target="refresh-libs" /> -->
442+
</javac>
445443
</target>
446444

447445
<target name="-post-clean" depends="refresh-libs">
448-
<delete file="lib/parse4cn1.cn1lib"/>
449446
</target>
450447

451448
<target name="refresh-libs">

test/CN1TestApp/codenameone_settings.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
#Wed Oct 21 19:44:09 CEST 2015
2+
#Sun Jun 19 09:31:46 CEST 2016
33
codename1.ios.appid=75WC6SX6UU.com.parse4cn1.TestApp
44
codename1.ios.release.provision=D\:\\Workspace\\projects\\parse4cn1\\test\\CN1TestApp\\resources\\ParsePush_IOS_DISTRIBUTION_Profile.mobileprovision
55
codename1.arg.rim.obfuscation=false
@@ -32,7 +32,7 @@ codename1.ios.release.certificatePassword=password
3232
codename1.arg.ios.prerendered_icon=false
3333
codename1.arg.vserv.scaleMode=false
3434
codename1.ios.debug.certificate=D\:\\Workspace\\projects\\parse4cn1\\test\\CN1TestApp\\resources\\CN1_development.p12
35-
libVersion=93
35+
libVersion=114
3636
codename1.arg.android.xapplication_attr=android\:name\="com.parse4cn1.nativeinterface.CN1AndroidApplication"
3737
codename1.arg.android.xpermissions=<uses-permission android\:name\="android.permission.INTERNET" /> <uses-permission android\:name\="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android\:name\="android.permission.WAKE_LOCK" /> <uses-permission android\:name\="android.permission.VIBRATE" /> <uses-permission android\:name\="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android\:name\="android.permission.GET_ACCOUNTS" /> <uses-permission android\:name\="com.google.android.c2dm.permission.RECEIVE" /> <permission android\:protectionLevel\="signature" android\:name\="com.parse4cn1.TestApp.permission.C2D_MESSAGE" /> <uses-permission android\:name\="com.parse4cn1.TestApp.permission.C2D_MESSAGE" />
3838
codename1.arg.ios.application_exits=false

test/CN1TestApp/lib/CLDC11.jar

4.93 KB
Binary file not shown.

test/CN1TestApp/lib/CodenameOne.jar

441 KB
Binary file not shown.
904 KB
Binary file not shown.
-4.99 MB
Binary file not shown.

test/JavaTestApplication/nbproject/project.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ annotation.processing.processors.list=
44
annotation.processing.run.all.processors=true
55
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
66
application.title=JavaTestApplication
7-
application.vendor=sidiabale
7+
application.vendor=SMash ICT Solutions
8+
auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
89
build.classes.dir=${build.dir}/classes
910
build.classes.excludes=**/*.java,**/*.form
1011
# This directory is removed when the project is cleaned:

0 commit comments

Comments
 (0)