diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000..1f0a7e9fb --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,44 @@ +# .circleci/config.yml +version: 2 +general: + branches: + only: + - develop +jobs: + build-and-test: + macos: + xcode: "9.2.0" + + working_directory: ~/temporarie + environment: + - UNITYVERSION: 2017.1.0f3 + - HASH: 472613c02cf7 + + steps: + - checkout + - run: + name: GIT Checkout + command: ./update-mapbox-unity-sdk-core.sh + - restore_cache: + keys: unity-installer-cache-500 + - run: + name: Installing Unity + command: ./scripts/install.sh ${HASH} ${UNITYVERSION} + - run: + name: Renaming Files + command: if [ ! -f "Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi && if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi && if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi + - save_cache: + key: unity-installer-cache-500 + paths: + - Unity-Mac.pkg + - UnitySetup-Windows-Support-for-Editor.pkg + - UnitySetup-iOS-Support-for-Editor.pkg + - run: + name: Building the project + command: ./scripts/build.sh + +workflows: + version: 2 + build-and-test: + jobs: + - build-and-test diff --git a/.travis.yml b/.travis.yml index 150dc9fdf..24999c833 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,4 +14,4 @@ mono: - latest script: - - ./scripts/build-docs.sh + - ./scripts/build-docs.sh \ No newline at end of file diff --git a/scripts/build.sh b/scripts/build.sh new file mode 100755 index 000000000..0ea893c94 --- /dev/null +++ b/scripts/build.sh @@ -0,0 +1,48 @@ +#! /bin/sh + +set -eu + +project="sdkproject" + +echo "Attempting to build $project for Windows" +/Applications/Unity/Unity.app/Contents/MacOS/Unity \ +-batchmode \ +-nographics \ +-silent-crashes \ +-logFile "$(pwd)/windows-build.log" \ +-projectPath "$(pwd)/${project}" \ +-buildWindowsPlayer "$(pwd)/Build/windows/${project}.exe" \ +-stackTraceLogType Full \ +-quit + +echo "Attempting to build $project for OS X" +/Applications/Unity/Unity.app/Contents/MacOS/Unity \ +-batchmode \ +-nographics \ +-silent -crashes \ +-logFile "$(pwd)/mac-build.log" \ +-projectPath "$(pwd)/${project}" \ +-buildOSXUniversalPlayer "$(pwd)/Build/osx/${project}.app" \ +-stackTraceLogType Full \ +-quit + +echo "Attempting to build $project for iOS" +/Applications/Unity/Unity.app/Contents/MacOS/Unity \ +-batchmode \ +-nographics \ +-silent -crashes \ +-logFile "$(pwd)/ios-build.log" \ +-projectPath "$(pwd)/${project}" \ +-executeMethod CIBuildScript.BuildForIOS \ +-stackTraceLogType Full \ +-quit + +echo 'Logs from build' +cat "$(pwd)/windows-build.log" +cat "$(pwd)/mac-build.log" +cat "$(pwd)/ios-build.log" + + +echo 'Attempting to zip builds' +zip -r $(pwd)/Build/mac.zip $(pwd)/Build/osx/ +zip -r $(pwd)/Build/windows.zip $(pwd)/Build/windows/ diff --git a/scripts/install.sh b/scripts/install.sh new file mode 100755 index 000000000..8356fcd4d --- /dev/null +++ b/scripts/install.sh @@ -0,0 +1,33 @@ +#! /bin/sh + +set -eu + +df -h + +BASE_URL=https://download.unity3d.com/download_unity +HASH=$1 +VERSION=$2 + +download() { + file=$1 + url="$BASE_URL/$HASH/$file" + localFile=`basename "$file"` + + if [ ! -f "$localFile" ]; then echo "Downloading $url" && curl -o "$localFile" "$url"; fi +} + +install() { + package=$1 + + echo "Installing "`basename "$package"` + sudo installer -dumplog -package `basename "$package"` -target / +} + +# See $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini for complete list +# of available packages, where PLATFORM is `osx` or `win` +if [ -d "../$CIRCLE_WORKING_DIRECTORY" ]; then cd .. && cd $CIRCLE_WORKING_DIRECTORY; fi +if [ -f "Unity-Mac.pkg" ]; then install "Unity-Mac.pkg"; else download "MacEditorInstaller/Unity-$VERSION.pkg" && install "MacEditorInstaller/Unity-$VERSION.pkg"; fi +wait +if [ -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then install "UnitySetup-Windows-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi +wait +if [ -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then install "UnitySetup-iOS-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg"; fi diff --git a/sdkproject/Assets/Mapbox/Examples/VectorDataVisualization.meta b/sdkproject/Assets/Mapbox/Examples/VectorDataVisualization.meta new file mode 100644 index 000000000..a844fee0c --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/VectorDataVisualization.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b8aaf5591d1784538916ed7ea18ca18a +folderAsset: yes +timeCreated: 1485384708 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/VectorDataVisualization/VectorDataVisualization.meta b/sdkproject/Assets/Mapbox/Examples/VectorDataVisualization/VectorDataVisualization.meta new file mode 100644 index 000000000..21bff49e1 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/VectorDataVisualization/VectorDataVisualization.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 68e3d92ca03a244d484e443f5b16b938 +folderAsset: yes +timeCreated: 1516308464 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/_sharedModules/ScenicMapImageFactory.asset b/sdkproject/Assets/Mapbox/Examples/_sharedModules/ScenicMapImageFactory.asset index 5b411d8af..0f1cee9f3 100644 --- a/sdkproject/Assets/Mapbox/Examples/_sharedModules/ScenicMapImageFactory.asset +++ b/sdkproject/Assets/Mapbox/Examples/_sharedModules/ScenicMapImageFactory.asset @@ -11,13 +11,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2b10536479dade041b6db9893fdf723a, type: 3} m_Name: ScenicMapImageFactory m_EditorClassIdentifier: - _mapIdType: 1 + _mapIdType: 0 _customStyle: Name: Id: mapbox://styles/mapbox/cjavylmncmgeb2rlnpimhp95q Modified: UserName: - _mapId: mapbox://styles/mapbox/cjavylmncmgeb2rlnpimhp95q + _mapId: mapbox://styles/mapbox/streets-v10 _useCompression: 0 _useMipMap: 1 _useRetina: 1 diff --git a/sdkproject/Assets/MapboxDevTools/Editor/CIBuildScript.cs b/sdkproject/Assets/MapboxDevTools/Editor/CIBuildScript.cs new file mode 100644 index 000000000..23d0fcd63 --- /dev/null +++ b/sdkproject/Assets/MapboxDevTools/Editor/CIBuildScript.cs @@ -0,0 +1,41 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; + +public class CIBuildScript : MonoBehaviour { + + + [MenuItem("Build/Build iOS")] + public static void BuildForIOS() + { + BuildPipeline.BuildPlayer(GetBuildPlayerOptions()); + } + + private static BuildPlayerOptions GetBuildPlayerOptions() + { + BuildPlayerOptions buildPlayerOptions = new BuildPlayerOptions(); + buildPlayerOptions.scenes = new[] + { + "Assets/Mapbox/Main.unity", + "Assets/Mapbox/Examples/1_Explorer/Explorer.unity", + "Assets/Mapbox/Examples/2_LocationProvider/LocationProvider.unity", + "Assets/Mapbox/Examples/3_VoxelMap/VoxelMap.unity", + "Assets/Mapbox/Examples/4_VectorTileMaps/BasicVectorMap/BasicVectorMap.unity", + "Assets/Mapbox/Examples/4_VectorTileMaps/InteractiveStyledVectorMap/InteractiveStyledVectorMap.unity", + "Assets/Mapbox/Examples/4_VectorTileMaps/PoiVectorMap/PoiVectorMap.unity", + "Assets/Mapbox/Examples/4_VectorTileMaps/TerrainVectorMap/TerrainVectorMap.unity", + "Assets/Mapbox/Examples/5_ZoomableMap/ZoomableMap.unity", + "Assets/Mapbox/Examples/6_Globe/Globe.unity", + "Assets/Mapbox/Examples/7_Playground/Scenes/Directions.unity", + "Assets/Mapbox/Examples/7_Playground/Scenes/ForwardGeoCoder.unity", + "Assets/Mapbox/Examples/7_Playground/Scenes/RasterTile.unity", + "Assets/Mapbox/Examples/7_Playground/Scenes/ReverseGeoCoder.unity", + "Assets/Mapbox/Examples/7_Playground/Scenes/VectorTile.unity" + }; + buildPlayerOptions.locationPathName = "../Build/iOSBuild"; + buildPlayerOptions.target = BuildTarget.iOS; + buildPlayerOptions.options = BuildOptions.Il2CPP; + return buildPlayerOptions; + } +} diff --git a/sdkproject/Assets/MapboxDevTools/Editor/CIBuildScript.cs.meta b/sdkproject/Assets/MapboxDevTools/Editor/CIBuildScript.cs.meta new file mode 100644 index 000000000..2708e1462 --- /dev/null +++ b/sdkproject/Assets/MapboxDevTools/Editor/CIBuildScript.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 307499e214e9e44afac69336c6fb21a6 +timeCreated: 1517583546 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Materials.meta b/sdkproject/Assets/Materials.meta new file mode 100644 index 000000000..93bc92f0b --- /dev/null +++ b/sdkproject/Assets/Materials.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e836c5975e22a4706b42845135244877 +folderAsset: yes +timeCreated: 1501256004 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/StreamingAssets.meta b/sdkproject/Assets/StreamingAssets.meta new file mode 100644 index 000000000..78e797308 --- /dev/null +++ b/sdkproject/Assets/StreamingAssets.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7ad5bb5010449443388dd2ce544bad0a +folderAsset: yes +timeCreated: 1516342779 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/StreamingAssets/build_info.txt.meta b/sdkproject/Assets/StreamingAssets/build_info.txt.meta new file mode 100644 index 000000000..14d063e85 --- /dev/null +++ b/sdkproject/Assets/StreamingAssets/build_info.txt.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 0dbf58a5ca9c849e9b82091275a3a98b +timeCreated: 1516342780 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/ProjectSettings/DynamicsManager.asset b/sdkproject/ProjectSettings/DynamicsManager.asset index 6be69106a..0be3d787c 100644 --- a/sdkproject/ProjectSettings/DynamicsManager.asset +++ b/sdkproject/ProjectSettings/DynamicsManager.asset @@ -16,3 +16,5 @@ PhysicsManager: m_EnableAdaptiveForce: 0 m_EnablePCM: 1 m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_AutoSimulation: 1 + m_AutoSyncTransforms: 1 diff --git a/sdkproject/ProjectSettings/Physics2DSettings.asset b/sdkproject/ProjectSettings/Physics2DSettings.asset index dd4738c2f..132ee6bc8 100644 --- a/sdkproject/ProjectSettings/Physics2DSettings.asset +++ b/sdkproject/ProjectSettings/Physics2DSettings.asset @@ -3,7 +3,7 @@ --- !u!19 &1 Physics2DSettings: m_ObjectHideFlags: 0 - serializedVersion: 2 + serializedVersion: 3 m_Gravity: {x: 0, y: -9.81} m_DefaultMaterial: {fileID: 0} m_VelocityIterations: 8 @@ -13,15 +13,18 @@ Physics2DSettings: m_MaxAngularCorrection: 8 m_MaxTranslationSpeed: 100 m_MaxRotationSpeed: 360 - m_MinPenetrationForPenalty: 0.01 m_BaumgarteScale: 0.2 m_BaumgarteTimeOfImpactScale: 0.75 m_TimeToSleep: 0.5 m_LinearSleepTolerance: 0.01 m_AngularSleepTolerance: 2 + m_DefaultContactOffset: 0.01 + m_AutoSimulation: 1 m_QueriesHitTriggers: 1 m_QueriesStartInColliders: 1 m_ChangeStopsCallbacks: 0 + m_CallbacksOnDisable: 1 + m_AutoSyncTransforms: 1 m_AlwaysShowColliders: 0 m_ShowColliderSleep: 1 m_ShowColliderContacts: 0 diff --git a/sdkproject/ProjectSettings/ProjectVersion.txt b/sdkproject/ProjectSettings/ProjectVersion.txt index ca1aa057c..7a6fffb8b 100644 --- a/sdkproject/ProjectSettings/ProjectVersion.txt +++ b/sdkproject/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.1.0f3 +m_EditorVersion: 2017.2.0f3 diff --git a/sdkproject/UnityPackageManager/manifest.json b/sdkproject/UnityPackageManager/manifest.json new file mode 100644 index 000000000..526aca605 --- /dev/null +++ b/sdkproject/UnityPackageManager/manifest.json @@ -0,0 +1,4 @@ +{ + "dependencies": { + } +}