Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(android): build with gradle #11339

Merged
merged 45 commits into from
Dec 20, 2019
Merged

refactor(android): build with gradle #11339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
ff5e7e1
refactor(android): build with gradle
jquick-axway Oct 15, 2019
41d110d
refactor(android): updated git-ignore list for gradle
jquick-axway Oct 15, 2019
9e14ef5
refactor(android): moved kroll-apt files to gradle std folders
jquick-axway Oct 15, 2019
0fb4184
refactor(android): modified SDK to download V8 during a clean
jquick-axway Oct 15, 2019
de2aa7e
refactor(android): rewrote manifest merge for gradle
jquick-axway Oct 26, 2019
e28f0a6
refactor(android): build modules with gradle
jquick-axway Nov 13, 2019
6e68afc
Merge branch 'master' into TIMOB-19300
jquick-axway Nov 14, 2019
094c2f4
refactor(android): re-integrated "cach.json" feature
jquick-axway Nov 14, 2019
5cbb4ae
refactor(android): finished merging "master" into TIMOB-19300
jquick-axway Nov 14, 2019
e9df409
refactor(android): resolved linting issues for TIMOB-19300
jquick-axway Nov 15, 2019
3c65f65
fix(android): sdk/ndk casing issue in SDK build script
jquick-axway Nov 15, 2019
fcaba3c
refactor(android): allow SDK build if "local.properties" file exists
jquick-axway Nov 15, 2019
f5a1f36
fix(android): can't debug Alloy device builds
jquick-axway Nov 16, 2019
382941b
refactor(android): prevent <activity/> configChanges override
jquick-axway Nov 16, 2019
9c00a17
refactor(android): native *.so lib packaging
jquick-axway Nov 19, 2019
5a76e4b
Merge branch 'master' into TIMOB-19300
jquick-axway Nov 19, 2019
5274e17
Merge branch 'master' into TIMOB-19300
sgtcoolguy Nov 19, 2019
72621a9
Merge branch 'master' into TIMOB-19300
sgtcoolguy Nov 19, 2019
8e18fd9
fix(android): titanium sdk version referencing in gradle
jquick-axway Nov 19, 2019
f539e4d
chore(android): added cli AndroidManfiest test script
jquick-axway Nov 19, 2019
fd951b0
Merge branch 'master' into TIMOB-19300
jquick-axway Nov 20, 2019
3d3b169
chore(android): add NDK side-by-side detection for SDK builds
jquick-axway Nov 21, 2019
8644b18
refactor(android): made transpile/snapshot a gradle prebuild step
jquick-axway Nov 23, 2019
8175934
refactor(android): added v8 snapshot fault tolerance
jquick-axway Nov 25, 2019
b1f47c0
refactor(android): sdk V8 snapshot changes
jquick-axway Nov 26, 2019
14fe927
chore(android): additional gradle build changes
jquick-axway Dec 11, 2019
11a8c15
Merge branch 'master' into TIMOB-19300
jquick-axway Dec 11, 2019
9925eb2
chore(android): re-added server V8 snapshot handling
jquick-axway Dec 11, 2019
26fd7c5
chore: have jenkins do a clean before build
jquick-axway Dec 11, 2019
50a7c69
fix(ios): jenkins build failure caused by new clean step
jquick-axway Dec 12, 2019
ebffede
chore(android): resolved SDK build failures on Windows
jquick-axway Dec 12, 2019
c5a9e26
refactor(android): improved cloud v8 snapshot handling
jquick-axway Dec 12, 2019
824a101
Merge branch 'master' into TIMOB-19300
jquick-axway Dec 12, 2019
90ed530
chore(android): removed JAR resources reference in SDK
jquick-axway Dec 12, 2019
7dd14a1
Merge branch 'master' into TIMOB-19300
lokeshchdhry Dec 16, 2019
ef83d71
Merge branch 'master' into TIMOB-19300
jquick-axway Dec 16, 2019
13fb76a
chore(android): made NDK optional for app builds
jquick-axway Dec 17, 2019
4318d5c
chore(android): allow SDK build system to override snapshot handling
jquick-axway Dec 17, 2019
d2b982b
fix(android): gradle module path issues on windows
jquick-axway Dec 18, 2019
8948fea
fix(android): don't compile with target api level
jquick-axway Dec 18, 2019
b504baa
Merge branch 'master' into TIMOB-19300
jquick-axway Dec 18, 2019
dc6db8c
chore(android): added i18n fallback for "en-US"
jquick-axway Dec 18, 2019
5fdfe29
fix(android): module build logs errors for unused annotations
jquick-axway Dec 18, 2019
2345b42
chore(android): v8 makefile improvements
jquick-axway Dec 18, 2019
ee08945
Merge branch 'master' into TIMOB-19300
lokeshchdhry Dec 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 0 additions & 14 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,6 @@ retirejs.output.json
junit.*.xml
junit_report.xml

# intelliJ Android User-specific configurations
/android/.idea/libraries/
/android/.idea/workspace.xml
/android/.idea/tasks.xml
/android/.idea/.name
/android/.idea/compiler.xml
/android/.idea/copyright/profiles_settings.xml
/android/.idea/encodings.xml
/android/.idea/misc.xml
/android/.idea/modules.xml
/android/.idea/scopes/scope_settings.xml
/android/.idea/vcs.xml
*.iml

/iphone/TitaniumKit/Carthage
/iphone/TitaniumKit/docs
/iphone/TitaniumKit/build
Expand Down
7 changes: 7 additions & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,13 @@ timestamps {

// TODO parallelize the iOS/Android/Windows portions?
ansiColor('xterm') {
timeout(15) {
def buildCommand = "npm run clean -- --android-ndk ${env.ANDROID_NDK_R16B} --android-sdk ${env.ANDROID_SDK}"
if (includeWindows) {
buildCommand += ' --all'
}
sh buildCommand
} // timeout
timeout(15) {
def buildCommand = "npm run build -- --android-ndk ${env.ANDROID_NDK_R16B} --android-sdk ${env.ANDROID_SDK}"
if (includeWindows) {
Expand Down
15 changes: 9 additions & 6 deletions android/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
bin
gen
*.pydevproject
*.jpage
.DS_Store
.ant_targets
.externalNativeBuild/
.gradle/
.idea/
build/
!/templates/build/
*.iml

/titanium/assets/Resources/ti.internal/build.properties
/local.properties
9 changes: 0 additions & 9 deletions android/.idea/libraries/android_support_compat.xml
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions android/.idea/libraries/android_support_design.xml
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions android/.idea/libraries/android_support_v7_cardview.xml
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions android/.idea/libraries/common.xml
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions android/.idea/libraries/jaxen_1_1_1.xml
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions android/.idea/libraries/support.xml
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions android/.idea/misc.xml
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions android/.idea/modules.xml
View file
Open in desktop

This file was deleted.