Skip to content

Commit 07c8140

Browse files
Plamen5kovPlamen5kov
authored
fix(tooling): wait for emulator before running adb commands (#912)
* Revert "refactor(project template): replace runtime project template with user template (#891)" This reverts commit 81f70ad. * fix(tooling): wait for emulator before running adb commands * chore: update messages
1 parent 6480aae commit 07c8140

File tree

183 files changed

+2934
-1124
lines changed

Some content is hidden

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

183 files changed

+2934
-1124
lines changed

‎.gitmodules‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,3 @@
44
[submodule "test-app/app/src/main/assets/app/shared"]
55
path = test-app/app/src/main/assets/app/shared
66
url = https://github.com/NativeScript/common-runtime-tests-app.git
7-
[submodule "test-app/build-tools/android-dts-generator"]
8-
path = test-app/build-tools/android-dts-generator
9-
url = https://github.com/NativeScript/android-dts-generator.git
10-
branch = master

‎.travis.yml‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,22 @@ env:
1010

1111
matrix:
1212
include:
13+
- stage: "Static Binding Generator Parser Tests"
14+
language: node_js
15+
node_js: "6"
16+
git:
17+
submodules: false
18+
script:
19+
- cd android-static-binding-generator
20+
- npm install && node run-tests
21+
- cd ..
22+
- stage: "Static Binding Generator Class Generator Tests"
23+
language: android
24+
jdk: oraclejdk8
25+
git:
26+
submodules: false
27+
script:
28+
- "android-static-binding-generator/project/staticbindinggenerator/gradlew test --project-dir android-static-binding-generator/project/staticbindinggenerator/"
1329
- stage: "Build and Tests"
1430
sudo: true
1531
language: android
@@ -25,13 +41,15 @@ matrix:
2541
submodules: false
2642
script:
2743
# (master branch) build the runtime twice - optimized, and regular packages, skip on PRs
28-
# test-app/gradlew runtests will take care of building the runtime for its testing needs
44+
# test-app/gradlew runtest will take care of building the runtime for its testing needs
2945
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./gradlew -PpreReleaseVersion=$PACKAGE_VERSION -PgitCommitVersion=$TRAVIS_COMMIT --stacktrace; fi'
3046
- echo no | android create avd --force -n $EMULATOR_NAME-$EMULATOR_API_LEVEL -t android-$EMULATOR_API_LEVEL --abi $ANDROID_ABI -c 12M
3147
- emulator -avd $EMULATOR_NAME-$EMULATOR_API_LEVEL -no-skin -no-audio -no-window &
3248
- android-wait-for-emulator
49+
- cd test-app
3350
- "./gradlew runtest --stacktrace"
3451
- adb -e logcat -d 300
52+
- cd ..
3553
before_install:
3654
- echo "y" | sdkmanager "cmake;3.6.4111459"
3755
- sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules

test-app/build-tools/android-metadata-generator/.gitattributes renamed to android-metadata-generator/.gitattributes

File renamed without changes.

test-app/build-tools/android-metadata-generator/.gitignore renamed to android-metadata-generator/.gitignore

File renamed without changes.

test-app/build-tools/android-metadata-generator/LICENCE renamed to android-metadata-generator/LICENCE

File renamed without changes.

test-app/build-tools/android-metadata-generator/README.md renamed to android-metadata-generator/README.md

File renamed without changes.

‎android-metadata-generator/build.gradle‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
/*
2+
* Packs metadata generator in a .tgz file in ~/dist folder
3+
* To build .tgz
4+
* gradlew packmg
5+
* To build jar
6+
* gradlew jarmg
7+
*/
8+
apply plugin: "java"
9+
10+
sourceCompatibility = 1.6
11+
targetCompatibility = 1.6
12+
13+
def isWinOs = System.properties['os.name'].toLowerCase().contains('windows')
14+
15+
buildscript {
16+
repositories {
17+
jcenter()
18+
}
19+
20+
dependencies {
21+
classpath 'com.android.tools.build:gradle:1.5.0'
22+
}
23+
}
24+
25+
sourceSets {
26+
main {
27+
java {
28+
srcDir 'src/src'
29+
}
30+
}
31+
main.output.classesDir = "$rootDir/dist/classes"
32+
}
33+
34+
dependencies {
35+
compile files("./src/libs/bcel-5.2.jar")
36+
compile files("./src/libs/dx.jar")
37+
}
38+
39+
task makeDistDir {
40+
def distDir = new File("$rootDir/dist")
41+
distDir.mkdirs()
42+
}
43+
44+
task cleanDist (type: Delete) {
45+
delete "$rootDir/dist"
46+
}
47+
48+
task cleanDistForJar (type: Delete) {
49+
delete "$rootDir/dist"
50+
}
51+
52+
task cleanBuildDir (type: Delete){
53+
delete "$rootDir/build"
54+
}
55+
56+
task cleanBuildDirForJar (type: Delete){
57+
delete "$rootDir/build"
58+
}
59+
60+
task cleanBin (type: Delete) {
61+
delete "$rootDir/src/bin"
62+
}
63+
64+
task copyNecessaryFiles {
65+
doLast {
66+
copy {
67+
from "$rootDir/helpers"
68+
into "$rootDir/dist/bin"
69+
}
70+
71+
copy {
72+
from "$rootDir/package.json"
73+
into "$rootDir/dist"
74+
}
75+
}
76+
}
77+
78+
task packMetadataGenerator (type: Exec) {
79+
workingDir "$rootDir/dist"
80+
81+
if(isWinOs) {
82+
commandLine "cmd", "/c", "npm", "pack"
83+
}
84+
else {
85+
commandLine "npm", "pack"
86+
}
87+
}
88+
89+
jar {
90+
manifest {
91+
attributes("Manifest-Version": "1.0",
92+
"Main-Class": "com.telerik.metadata.Generator")
93+
}
94+
95+
from {
96+
97+
configurations.runtime.collect {
98+
it.isDirectory() ? it : zipTree(it)
99+
}
100+
101+
configurations.compile.collect {
102+
it.isDirectory() ? it : zipTree(it)
103+
}
104+
}
105+
}
106+
107+
task copyJarToDist (type: Copy) {
108+
from "$rootDir/build/libs/android-metadata-generator.jar"
109+
into "$rootDir/dist"
110+
}
111+
112+
makeDistDir.dependsOn(cleanDist)
113+
cleanBin.dependsOn(makeDistDir)
114+
compileJava.dependsOn(cleanBin)
115+
cleanBuildDir.dependsOn(compileJava)
116+
copyNecessaryFiles.dependsOn(cleanBuildDir)
117+
packMetadataGenerator.dependsOn(copyNecessaryFiles)
118+
119+
task packmg {
120+
dependsOn packMetadataGenerator
121+
}
122+
123+
cleanDistForJar.dependsOn(jar)
124+
copyJarToDist.dependsOn(cleanDistForJar)
125+
cleanBuildDirForJar.dependsOn(copyJarToDist)
126+
127+
task jarmg {
128+
dependsOn cleanBuildDirForJar
129+
}
130+
131+

‎android-metadata-generator/gradle/wrapper/gradle-wrapper.jar‎

53.4 KB
Binary file not shown.

‎android-metadata-generator/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
zipStoreBase=GRADLE_USER_HOME
4+
zipStorePath=wrapper/dists
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip

‎android-metadata-generator/gradlew‎

Lines changed: 172 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)