Skip to content

Commit 3f8c37f

Browse files
authored
Merge pull request #15 from jquick-axway/TIMOB-27730
feat(android): migrate to gradle and AndroidX Fixes TIMOB-27730
2 parents 9072e52 + 2ff1465 commit 3f8c37f

26 files changed

+6550
-192
lines changed

.eslintignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
node_modules
2+
3+
android/bin/
4+
android/build/
5+
android/dist/
6+
ios/build/
7+
ios/dist/
8+
9+
# These should eventually be linted as well
10+
android/example/
11+
ios/example/

.eslintrc

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"extends": [ "axway/env-titanium", "axway/env-node" ],
3+
"parserOptions": {
4+
"ecmaVersion": 2015,
5+
"sourceType": "script"
6+
},
7+
"overrides": [
8+
{
9+
"files": [ "dangerfile.js" ],
10+
"parserOptions": {
11+
"ecmaVersion": 2017,
12+
"sourceType": "module"
13+
}
14+
}
15+
]
16+
}

.gitignore

Lines changed: 38 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,41 @@
11
.DS_Store
2-
metadata.json
3-
*.zip
2+
tmp
3+
bin
4+
build
5+
6+
*/*/modules
7+
*/*/modules*
8+
.apt_generated
9+
build.properties
10+
.gitignore
11+
.svn
12+
*.pyc
13+
*~.nib/
14+
*.pbxuser
15+
*.perspective
16+
*.perspectivev3
417
*.xcworkspace/
18+
xcuserdata
519
*.xcuserstate
6-
xcuserdata/
7-
build/
8-
/android/dist
9-
ios/titanium-web-dialog.xcodeproj/project.xcworkspace/xcuserdata
10-
android/libs
20+
*.xcuserdata*
21+
22+
.idea/
23+
libs/
24+
25+
android/clean
26+
android/ant_clean
27+
android/.classpath
28+
android/.settings
29+
android/dist/
30+
android/launch-*
31+
android/java-sources.txt
32+
nbproject
33+
/ios/metadata.json
34+
/ios/dist
35+
/ios/ti.map-iphone-*.zip
36+
37+
node_modules/
38+
39+
TESTS-*.xml
40+
41+
.vscode/

.npmignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
android/documentation/
2+
android/example/
3+
4+
iphone/documentation/
5+
iphone/example/
6+
iphone/platform/
7+
8+
test/
9+
apidoc/
10+
Jenkinsfile
11+
dangerfile.js

Jenkinsfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
@Library('pipeline-library') _
1+
library 'pipeline-library'
2+
3+
def isMaster = env.BRANCH_NAME.equals('master')
24

35
buildModule {
4-
// defaults:
5-
//nodeVersion = '4.7.3' // Must have version set up on Jenkins master before it can be changed
6-
//sdkVersion = '6.0.3.GA'
7-
//androidAPILevel = '23' // if changed, must install on build nodes
6+
sdkVersion = '9.0.0.v20200127103011'
7+
npmPublish = isMaster // By default it'll do github release on master anyways too
8+
iosLabels = 'osx && xcode-11'
89
}

android/.classpath

Lines changed: 0 additions & 11 deletions
This file was deleted.

android/.project

Lines changed: 0 additions & 29 deletions
This file was deleted.

android/.settings/org.eclipse.jdt.apt.core.prefs

Lines changed: 0 additions & 7 deletions
This file was deleted.

android/.settings/org.eclipse.jdt.core.prefs

Lines changed: 0 additions & 3 deletions
This file was deleted.

android/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
dependencies {
3+
implementation 'androidx.browser:browser:1.2.0'
4+
}

0 commit comments

Comments
 (0)