Skip to content

Commit 9376eb1

Browse files
DurankGtsDurankGts
authoredOct 1, 2018
Merge pull request #18 from codenameone/master
011018_843AM_addingChangesFromCn1Repository
2 parents e54fa9a + 0a6226e commit 9376eb1

File tree

138 files changed

+7790
-1264
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+7790
-1264
lines changed
 

‎.travis.yml

+113-83
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
matrix:
22
include:
3+
# - language: java
4+
# env: CN1_PLATFORM=javase CN1_RUNTESTS_JAVASE=1
5+
# jdk: openjdk11
6+
# before_script:
7+
# - "export DISPLAY=:99.0"
8+
# - "sh -e /etc/init.d/xvfb start"
9+
# - language: java
10+
# env: CN1_PLATFORM=javase CN1_RUNTESTS_JAVASE=1
11+
# jdk: oraclejdk11
12+
# before_script:
13+
# - "export DISPLAY=:99.0"
14+
# - "sh -e /etc/init.d/xvfb start"
15+
- language: java
16+
env: CN1_PLATFORM=javase CN1_RUNTESTS_JAVASE=1
17+
jdk: openjdk10
18+
before_script:
19+
- "export DISPLAY=:99.0"
20+
- "sh -e /etc/init.d/xvfb start"
21+
- language: java
22+
env: CN1_PLATFORM=javase CN1_RUNTESTS_JAVASE=1
23+
jdk: oraclejdk10
24+
before_script:
25+
- "export DISPLAY=:99.0"
26+
- "sh -e /etc/init.d/xvfb start"
27+
- language: java
28+
env: CN1_PLATFORM=javase CN1_RUNTESTS_JAVASE=1
29+
jdk: oraclejdk9
30+
before_script:
31+
- "export DISPLAY=:99.0"
32+
- "sh -e /etc/init.d/xvfb start"
333
- language: java
434
env: CN1_PLATFORM=javase CN1_RUNTESTS_JAVASE=1
535
jdk: oraclejdk8
@@ -24,73 +54,73 @@ matrix:
2454
# - addon-google_apis-google-15
2555
# - sys-img-armeabi-v7a-google_apis-15
2656
# ##</CN1:android-15>##
27-
##<CN1:android-16>##
28-
- language: android
29-
if: type IN (push, cron)
30-
jdk: oraclejdk8
31-
env: CN1_PLATFORM=android API=16 CN1_RUNTESTS_ANDROID_EMULATOR=1
32-
addons:
33-
apt:
34-
packages:
35-
- ant
36-
- maven
37-
android:
38-
components:
39-
- platform-tools
40-
- android-16
41-
- sys-img-armeabi-v7a-android-16
42-
##</CN1:android-16>##
43-
##<CN1:android-17>##
44-
- language: android
45-
if: type IN (push, cron)
46-
jdk: oraclejdk8
47-
env: CN1_PLATFORM=android API=17 CN1_RUNTESTS_ANDROID_EMULATOR=1
48-
addons:
49-
apt:
50-
packages:
51-
- ant
52-
- maven
53-
android:
54-
components:
55-
- platform-tools
56-
- android-17
57-
- addon-google_apis-google-17
58-
- sys-img-armeabi-v7a-google_apis-17
59-
##</CN1:android-17>##
60-
##<CN1:android-18>##
61-
- language: android
62-
if: type IN (push, cron)
63-
jdk: oraclejdk8
64-
env: CN1_PLATFORM=android API=18 CN1_RUNTESTS_ANDROID_EMULATOR=1
65-
addons:
66-
apt:
67-
packages:
68-
- ant
69-
- maven
70-
android:
71-
components:
72-
- platform-tools
73-
- android-18
74-
- addon-google_apis-google-18
75-
- sys-img-armeabi-v7a-google_apis-18
76-
##</CN1:android-18>##
77-
##<CN1:android-19>##
78-
- language: android
79-
if: type IN (push, cron)
80-
jdk: oraclejdk8
81-
env: CN1_PLATFORM=android API=19 CN1_RUNTESTS_ANDROID_EMULATOR=1
82-
addons:
83-
apt:
84-
packages:
85-
- ant
86-
- maven
87-
android:
88-
components:
89-
- platform-tools
90-
- android-19
91-
- sys-img-armeabi-v7a-android-19
92-
- sys-img-armeabi-v7a-addon-google_apis-google-19
93-
##</CN1:android-19>##
57+
# ##<CN1:android-16>##
58+
# - language: android
59+
# if: type IN (push, cron)
60+
# jdk: oraclejdk8
61+
# env: CN1_PLATFORM=android API=16 CN1_RUNTESTS_ANDROID_EMULATOR=1
62+
# addons:
63+
# apt:
64+
# packages:
65+
# - ant
66+
# - maven
67+
# android:
68+
# components:
69+
# - platform-tools
70+
# - android-16
71+
# - sys-img-armeabi-v7a-android-16
72+
# ##</CN1:android-16>##
73+
# ##<CN1:android-17>##
74+
# - language: android
75+
# if: type IN (push, cron)
76+
# jdk: oraclejdk8
77+
# env: CN1_PLATFORM=android API=17 CN1_RUNTESTS_ANDROID_EMULATOR=1
78+
# addons:
79+
# apt:
80+
# packages:
81+
# - ant
82+
# - maven
83+
# android:
84+
# components:
85+
# - platform-tools
86+
# - android-17
87+
# - addon-google_apis-google-17
88+
# - sys-img-armeabi-v7a-google_apis-17
89+
# ##</CN1:android-17>##
90+
# ##<CN1:android-18>##
91+
# - language: android
92+
# if: type IN (push, cron)
93+
# jdk: oraclejdk8
94+
# env: CN1_PLATFORM=android API=18 CN1_RUNTESTS_ANDROID_EMULATOR=1
95+
# addons:
96+
# apt:
97+
# packages:
98+
# - ant
99+
# - maven
100+
# android:
101+
# components:
102+
# - platform-tools
103+
# - android-18
104+
# - addon-google_apis-google-18
105+
# - sys-img-armeabi-v7a-google_apis-18
106+
# ##</CN1:android-18>##
107+
# ##<CN1:android-19>##
108+
# - language: android
109+
# if: type IN (push, cron)
110+
# jdk: oraclejdk8
111+
# env: CN1_PLATFORM=android API=19 CN1_RUNTESTS_ANDROID_EMULATOR=1
112+
# addons:
113+
# apt:
114+
# packages:
115+
# - ant
116+
# - maven
117+
# android:
118+
# components:
119+
# - platform-tools
120+
# - android-19
121+
# - sys-img-armeabi-v7a-android-19
122+
# - sys-img-armeabi-v7a-addon-google_apis-google-19
123+
# ##</CN1:android-19>##
94124
##<CN1:android-21>##
95125
- language: android
96126
if: type IN (push, cron)
@@ -108,22 +138,22 @@ matrix:
108138
- sys-img-armeabi-v7a-android-21
109139
- sys-img-armeabi-v7a-addon-google_apis-google-21
110140
##</CN1:android-21>##
111-
##<CN1:android-22>##
112-
- language: android
113-
if: type IN (push, cron)
114-
jdk: oraclejdk8
115-
env: CN1_PLATFORM=android API=22 CN1_RUNTESTS_ANDROID_EMULATOR=1
116-
addons:
117-
apt:
118-
packages:
119-
- ant
120-
- maven
121-
android:
122-
components:
123-
- platform-tools
124-
- android-22
125-
- sys-img-armeabi-v7a-android-22
126-
##</CN1:android-22>##
141+
# ##<CN1:android-22>##
142+
# - language: android
143+
# if: type IN (push, cron)
144+
# jdk: oraclejdk8
145+
# env: CN1_PLATFORM=android API=22 CN1_RUNTESTS_ANDROID_EMULATOR=1
146+
# addons:
147+
# apt:
148+
# packages:
149+
# - ant
150+
# - maven
151+
# android:
152+
# components:
153+
# - platform-tools
154+
# - android-22
155+
# - sys-img-armeabi-v7a-android-22
156+
# ##</CN1:android-22>##
127157
# Need to wait for iOS build server update before iOS automated tests
128158
# will work, so we comment them out for now.
129159
# TODO: Uncomment when build server is updated.

‎CodenameOne/nbproject/project.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ javac.compilerargs=
3939
javac.deprecation=false
4040
javac.processorpath=\
4141
${javac.classpath}
42-
javac.source=1.5
43-
javac.target=1.5
42+
javac.source=1.6
43+
javac.target=1.6
4444
javac.test.classpath=\
4545
${javac.classpath}:\
4646
${build.classes.dir}
@@ -76,4 +76,4 @@ source.encoding=windows-1252
7676
src.dir=src
7777
test.src.dir=test
7878
endorsed.classpath.cmd.line.arg=-bootclasspath ${file.reference.corevm.jar}
79-
codenameone.dir=../../CodenameOne
79+
codenameone.dir=../../CodenameOne

0 commit comments

Comments
 (0)
Please sign in to comment.