From a68788a2cfb85efe69b0d81672bff7272368494e Mon Sep 17 00:00:00 2001 From: Tobrun Date: Fri, 12 May 2017 20:07:06 +0200 Subject: [android] Release android-v5.1.0-beta.2 (#8976) * [android] url getter on sources * [android] fix ui test filter in makefile * [android] - build SNAPSHOT from release branch (#8958) * [android] - update changelog for 5.1.0-beta.2 * [android] - bump version number * [android] - Camera change listener v2.0 * [core] allow filesource url transform reset * [android] Update attribution wordmark (#8774) * Update wordmark on android * Moved attribution i icon to the right of mapbox word (in mapview preview image) * update padding and margin * [android] update hardcoded branch name * revert version to 5.1.0-SNAPSHOT --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e8f7f175ff..abccb306a6 100644 --- a/Makefile +++ b/Makefile @@ -571,7 +571,7 @@ run-android-ui-test-$1: platform/android/configuration.gradle run-android-ui-test-$1-%: platform/android/configuration.gradle adb uninstall com.mapbox.mapboxsdk.testapp > /dev/null - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class="$*" + cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class="$$*" endef -- cgit v1.2.1 From 6cba15f3a964b39184651dae32cccf32c8d706d0 Mon Sep 17 00:00:00 2001 From: Jason Wray Date: Wed, 14 Jun 2017 03:01:02 -0400 Subject: [ios] Remove old Fabric build infrastructure --- Makefile | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index abccb306a6..1a635cdd3c 100644 --- a/Makefile +++ b/Makefile @@ -253,11 +253,6 @@ iframework: $(IOS_PROJ_PATH) FORMAT=dynamic BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=$(SYMBOLS) \ ./platform/ios/scripts/package.sh -.PHONY: ifabric -ifabric: $(IOS_PROJ_PATH) - FORMAT=static BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=NO SELF_CONTAINED=YES \ - ./platform/ios/scripts/package.sh - .PHONY: ideploy ideploy: caffeinate -i ./platform/ios/scripts/deploy-packages.sh -- cgit v1.2.1