Skip to content

Commit 7897e2d

Browse files
Plamen5kovPlamen5kov
authored
Plamen5kov/update gradle to latest stable (#849)
* update runtime project update gradle of projects update gitmodules and gitignore update root build gradle add new project structure named new module so no breaking changes updated gitignore after gitignore update update build.gradle mssing build-artifacts folder stop ignoring build-artifactse add optimization flags (fix warnings later) update readme * add iml file or android studio does not open the project ok * update travis to use ndk 15c * bump android version * add accept licenses in travis * trying to fix travis * trying to fix travis
1 parent 88731f9 commit 7897e2d

681 files changed

Lines changed: 30593 additions & 31626 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
node_modules/
33
dist/
44
.gradle
5-
/test-app/build
6-
/test-app/libs
7-
/test-app/metadata
85
.idea
96

107
local.properties
@@ -21,4 +18,3 @@ bin/
2118
.DS_Store
2219
.settings
2320

24-
*.iml

‎.gitmodules‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
[submodule "test-app/assets/app/shared"]
2-
path = test-app/app/src/main/assets/app/shared
3-
url = git@github.com:NativeScript/common-runtime-tests-app.git
4-
[submodule "test-app/assets/app/tns_modules/shared"]
1+
[submodule "test-app/app/src/main/assets/app/tns_modules/tns-core-modules/shared"]
52
path = test-app/app/src/main/assets/app/tns_modules/tns-core-modules/shared
6-
url = git@github.com:NativeScript/common-runtime-tests-modules.git
3+
url = https://github.com/NativeScript/common-runtime-tests-modules.git
4+
[submodule "test-app/app/src/main/assets/app/shared"]
5+
path = test-app/app/src/main/assets/app/shared
6+
url = https://github.com/NativeScript/common-runtime-tests-app.git

‎.idea/.name‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.idea/compiler.xml‎

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

‎.idea/copyright/profiles_settings.xml‎

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

‎.idea/encodings.xml‎

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

‎.idea/misc.xml‎

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

‎.idea/runConfigurations.xml‎

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

‎.idea/vcs.xml‎

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

‎.travis.yml‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
env:
22
global:
33
- NODE_VERSION=6.11.1
4-
- NDK_VERSION=r12b
4+
- NDK_VERSION=r15c
55
- DATE=$(date +%Y-%m-%d)
66
- PACKAGE_VERSION=next-$DATE-$TRAVIS_BUILD_NUMBER
77
- EMULATOR_API_LEVEL=21
@@ -15,24 +15,30 @@ git:
1515
submodules: false
1616
android:
1717
components:
18-
- platform-tools
19-
- tools
20-
- build-tools-25.0.2
21-
- android-23
22-
- android-$EMULATOR_API_LEVEL
23-
- extra-android-support
24-
- extra-android-m2repository
25-
- sys-img-$ANDROID_ABI-android-$EMULATOR_API_LEVEL
18+
- platform-tools
19+
- tools
20+
- build-tools-26.0.1
21+
- android-26
22+
- android-$EMULATOR_API_LEVEL
23+
- extra-android-support
24+
- extra-android-m2repository
25+
- cmake
26+
- sys-img-$ANDROID_ABI-android-$EMULATOR_API_LEVEL
27+
licenses:
28+
- 'android-sdk-preview-license-52d11cd2'
29+
- 'android-sdk-license-.+'
30+
- 'google-gdk-license-.+'
2631
before_cache:
2732
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
2833
cache:
2934
directories:
3035
- "$HOME/.gradle/caches/"
3136
- "$HOME/.gradle/wrapper/"
3237
before_install:
38+
- echo "y" | sdkmanager "cmake;3.6.4111459"
3339
- sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
3440
- git submodule update --init --recursive
35-
- wget http://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux-x86_64.zip
41+
- wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux-x86_64.zip
3642
- chmod +x android-ndk-$NDK_VERSION-linux-x86_64.zip
3743
- "unzip -q android-ndk-$NDK_VERSION-linux-x86_64.zip"
3844
- "rm -rf android-ndk-$NDK_VERSION-linux-x86_64.zip"
@@ -41,10 +47,10 @@ before_install:
4147
install:
4248
- nvm install $NODE_VERSION
4349
script:
44-
- "./gradlew createPackage -i -PpreReleaseVersion=$PACKAGE_VERSION -PgitCommitVersion=$TRAVIS_COMMIT --stacktrace"
50+
- "./gradlew -PpreReleaseVersion=$PACKAGE_VERSION -PgitCommitVersion=$TRAVIS_COMMIT --stacktrace"
4551
- echo no | android create avd --force -n $EMULATOR_NAME-$EMULATOR_API_LEVEL -t android-$EMULATOR_API_LEVEL --abi $ANDROID_ABI -c 12M
4652
- emulator -avd $EMULATOR_NAME-$EMULATOR_API_LEVEL -no-skin -no-audio -no-window &
4753
- android-wait-for-emulator
48-
- "cd test-app && ./gradlew assembleDebug runtests -PembedBindingGenerator=true --stacktrace"
54+
- "cd test-app && ./gradlew runtest --stacktrace"
4955
- adb -e logcat -d 300
5056
- cd ..

0 commit comments

Comments
 (0)