Skip to content

Commit 40dd87e

Browse files
Fix CI: Update POM versions and config for native builds
- Updated `pom.xml` to use Codename One version `7.0.215`. - Added `maven-source-plugin` to `pom.xml` to fix build warnings. - Created `BTDemo/codenameone_settings.properties` to ensure `cn1:build` correctly locates the project and generates sources. - Updated `scripts/ci/build-thirdparty-app.sh` to use `cn1:build` goal instead of `package`. - Updated `.github/workflows/maven.yml` to dynamically find and build generated native projects (Gradle/Xcode) before running simulators. - Improved robustness of artifact locating logic using `find` in the pipeline steps.
1 parent b65c72a commit 40dd87e

File tree

3 files changed

+58
-2
lines changed

3 files changed

+58
-2
lines changed
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
#
2+
#Wed Aug 05 08:50:57 PDT 2020
3+
codename1.ios.appid=Q5GHSKAL2F.com.codename1.btle
4+
codename1.ios.release.provision=
5+
codename1.arg.java.version=8
6+
codename1.arg.rim.obfuscation=false
7+
codename1.arg.ios.newStorageLocation=true
8+
codename1.j2me.nativeTheme=nbproject/nativej2me.res
9+
codename1.arg.ios.project_type=ios
10+
foobarfoo=This is a description of what we are going to do
11+
codename1.arg.ios.interface_orientation=UIInterfaceOrientationPortrait\:UIInterfaceOrientationPortraitUpsideDown\:UIInterfaceOrientationLandscapeLeft\:UIInterfaceOrientationLandscapeRight
12+
codename1.displayName=BTDemo
13+
codename1.arg.ios.pods.platform=,11.0
14+
codename1.android.keystoreAlias=
15+
codename1.ios.release.certificate=
16+
codename1.arg.ios.background_modes=,bluetooth-central,bluetooth-peripheral
17+
codename1.android.keystorePassword=
18+
codename1.ios.provision=
19+
codename1.arg.ios.add_libs=;CoreBluetooth.framework;
20+
codename1.arg.ios.dsym=false
21+
codename1.arg.android.release=true
22+
codename1.arg.ios.statusbar_hidden=false
23+
codename1.languageLevel=5
24+
codename1.android.keystore=
25+
codename1.arg.ios.pods=,Cordova,Cordova ~> 6.1
26+
codename1.vendor=CodenameOne
27+
codename1.arg.win.ver=8
28+
codename1.ios.certificatePassword=
29+
codename1.ios.debug.certificatePassword=
30+
codename1.mainName=BTDemo
31+
codename1.ios.release.certificatePassword=
32+
codename1.arg.ios.prerendered_icon=false
33+
codename1.ios.debug.certificate=
34+
libVersion=111
35+
codename1.arg.android.xpermissions=<uses-permission android\:name\="android.permission.BLUETOOTH"/><uses-permission android\:name\="android.permission.BLUETOOTH_ADMIN"/><uses-permission android\:name\="android.permission.ACCESS_COARSE_LOCATION"/>
36+
codename1.arg.ios.application_exits=false
37+
codename1.secondaryTitle=CodenameOne_Template
38+
codename1.description=
39+
codename1.ios.debug.provision=
40+
codename1.arg.j2me.nativeThemeConst=0
41+
codename1.rim.certificatePassword=
42+
codename1.version=1.0
43+
codename1.ios.certificate=
44+
codename1.icon=icon.png
45+
codename1.rim.signtoolCsk=
46+
codename1.arg.ios.plistInject=<key>NSBluetoothPeripheralUsageDescription</key><string>${foobarfoo}</string>
47+
codename1.arg.android.debug=false
48+
codename1.rim.signtoolDb=
49+
codename1.arg.ios.testFlight=false
50+
codename1.arg.ios.includePush=false
51+
codename1.packageName=com.codename1.btle

pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646

4747

4848
<properties>
49-
<cn1.plugin.version>7.0.26</cn1.plugin.version>
50-
<cn1.version>7.0.26</cn1.version>
49+
<cn1.plugin.version>7.0.215</cn1.plugin.version>
50+
<cn1.version>7.0.215</cn1.version>
5151
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5252

5353
<java.version>1.8</java.version>
@@ -210,6 +210,7 @@
210210
<plugin>
211211
<groupId>org.apache.maven.plugins</groupId>
212212
<artifactId>maven-source-plugin</artifactId>
213+
<version>3.2.1</version>
213214
<executions>
214215
<execution>
215216
<id>attach-sources</id>

scripts/ci/build-thirdparty-app.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ function build_target() {
8787
mvn_args+=("-Dcn1.plugin.version=$CODENAMEONE_PLUGIN_VERSION")
8888
fi
8989

90+
# Explicitly set the project directory to help the plugin find settings
91+
# Assuming APP_WORK_DIR is relative to current directory or absolute
92+
# We are already inside pushd APP_WORK_DIR, so project root is "."
93+
9094
# Use cn1:build to generate native sources
9195
"$mvn_cmd" "${mvn_args[@]}" cn1:build
9296
popd >/dev/null

0 commit comments

Comments
 (0)