Merge branch 'release/v1.5.0'

platformio · Dec 18, 2016 · a9c6ec9 · a9c6ec9
2 parents 96cadbf + 7a2670f
commit a9c6ec9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ python:
 env:
   - PLATFORMIO_PROJECT_DIR=examples/mbed-blink
   - PLATFORMIO_PROJECT_DIR=examples/mbed-dsp
-  - PLATFORMIO_PROJECT_DIR=examples/mbed-http-client
+  # - PLATFORMIO_PROJECT_DIR=examples/mbed-http-client
   - PLATFORMIO_PROJECT_DIR=examples/mbed-rtos
   - PLATFORMIO_PROJECT_DIR=examples/mbed-serial
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -4,7 +4,7 @@ environment:
   matrix:
     - PLATFORMIO_PROJECT_DIR: "examples/mbed-blink"
     - PLATFORMIO_PROJECT_DIR: "examples/mbed-dsp"
-    - PLATFORMIO_PROJECT_DIR: "examples/mbed-http-client"
+    # - PLATFORMIO_PROJECT_DIR: "examples/mbed-http-client"
     - PLATFORMIO_PROJECT_DIR: "examples/mbed-rtos"
     - PLATFORMIO_PROJECT_DIR: "examples/mbed-serial"
 

diff --git a/builder/frameworks/mbed b/builder/frameworks/mbed
diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-freescalekinetis.git"
   },
-  "version": "1.4.0",
+  "version": "1.5.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
@@ -32,7 +32,7 @@
     "framework-mbed": {
       "type": "framework",
       "optional": true,
-      "version": "~3.126.0"
+      "version": "~3.131.0"
     }
   }
 }