diff --git a/.travis.yml b/.travis.yml index 52534c8ad0..e8f58ded45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,8 +95,9 @@ install: npm install elif [[ ("$TEST_SUITE" = "ios") ]]; then git submodule update --init --remote - cd weex-playground/ios && bash update_podfile_for_travisci.sh - cd ../../ && npm install + # cd weex-playground/ios && bash update_podfile_for_travisci.sh + # cd ../../ && + npm install cd weex-playground/ios && pod install --repo-update cd ../../ elif [[ ("${FORMAT_CODE}" = "true" )]]; then @@ -143,7 +144,8 @@ script: # build WeexSDK and run WeexSDKTests xcodebuild -project ios/sdk/WeexSDK.xcodeproj test -scheme WeexSDKTests CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -destination "platform=iOS Simulator,name=iPhone 6" | grep -A 5 error: # build WeexDemo and run WeexDemo test - xcodebuild -workspace weex-playground/ios/WeexDemo.xcworkspace test -scheme WeexDemo CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -destination "platform=iOS Simulator,name=iPhone 6" | grep -A 5 error: + cd weex-playground/ios && mkdir tmp && mv * tmp;cd tmp + xcodebuild -workspace WeexDemo.xcworkspace test -scheme WeexDemo CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -destination "platform=iOS Simulator,name=iPhone 6" | grep -A 5 error: fi ;; esac diff --git a/format-tool/google-java-format-1.7-all-deps.jar b/format-tool/google-java-format-1.7-all-deps.jar deleted file mode 100644 index e2d40de463..0000000000 Binary files a/format-tool/google-java-format-1.7-all-deps.jar and /dev/null differ diff --git a/weex-playground b/weex-playground index e36dd29b69..996e447ef1 160000 --- a/weex-playground +++ b/weex-playground @@ -1 +1 @@ -Subproject commit e36dd29b693745cc48deaa840f63eb56a99c67bf +Subproject commit 996e447ef1e0ecc5416e91147e05632c4f4802fa