From eb1632cb628f7cbd8b7d7cb6478a314a07d26d02 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Mon, 18 May 2020 12:43:37 -0400 Subject: [PATCH] Install cocoapods dependencies & gradle works on JDK 11 now. --- .gitlab-ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ec223de..27a5d3a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,10 +9,12 @@ build_project: - "( ./lib/bin/build_libsodium-macos clean && ./lib/bin/build_libsodium-macos )" - "( ./lib/bin/build_libjson-c-macos clean && ./lib/bin/build_libjson-c-macos )" - "( cd ./platform-independent/c/cli && ./clean && targets=all ./build && ./mpw-tests && ./mpw-cli-tests )" - - "( export JAVA_HOME=$(java_home -Fv 10 || java_home -Fv 9* ) && ./gradlew --stacktrace clean test )" + - "( ./gradlew --stacktrace --info clean test )" + - "( cd platform-darwin && pod install )" - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword iOS' -sdk iphonesimulator clean build )" - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword macOS' clean build )" tags: - brew - - java_9 - - xcode_11 + - java + - cocoapods + - xcode