updating for l5

Author: pulkitjalan

README.md

@@ -1,7 +1,7 @@
 Google Api Client Wrapper
 =========
 
-> Google api php client wrapper with Cloud Platform and Laravel support
+> Google api php client wrapper with Cloud Platform and Laravel 4 & 5 support
 
 [![Build Status](http://img.shields.io/travis/pulkitjalan/google-apiclient.svg?style=flat-square)](https://travis-ci.org/pulkitjalan/google-apiclient)
 [![Scrutinizer Code Quality](http://img.shields.io/scrutinizer/g/pulkitjalan/google-apiclient/master.svg?style=flat-square)](https://scrutinizer-ci.com/g/pulkitjalan/google-apiclient/)
@@ -42,7 +42,11 @@ Next add the following to the `aliases` array in your `config/app.php`
 'Google' => 'PulkitJalan\Google\Facades\Google'
 ```
 
-Finally run `php artisan config:publish pulkitjalan/google-apiclient` to publish the config file.
+Finally run `php artisan vendor:publish --provider="pulkitjalan\google-apiclient\GoogleServiceProvider" --tag="config"` to publish the config file.
+
+#### Looking for a Laravel 4 compatible version?
+
+Checkout the [1.0 branch](https://github.com/pulkitjalan/google-apiclient/tree/1.0)
 
 ## Usage
 

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "pulkitjalan/google-apiclient",
-    "description": "Google api php client wrapper with Cloud Platform and Laravel support",
+    "description": "Google api php client wrapper with Cloud Platform and Laravel 4 & 5 support",
     "homepage": "https://github.com/pulkitjalan/google-apiclient",
     "keywords": ["laravel", "google", "cloud platform"],
     "license": "MIT",
@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "illuminate/support": "~4",
+        "illuminate/support": "~5",
         "google/apiclient": "1.*"
     },
     "require-dev": {

src/GoogleServiceProvider.php

@@ -21,6 +21,10 @@ public function boot()
         $this->app['PulkitJalan\Google\Client'] = function ($app) {
             return $app['google.api.client'];
         };
+
+        $this->publishes([
+            __DIR__.'/config/config.php' => config_path('google.php'),
+        ], 'config');
     }
 
     /**
@@ -30,10 +34,10 @@ public function boot()
      */
     public function register()
     {
-        $this->app->config->package('pulkitjalan/google-apiclient', realpath(__DIR__.'/config'), 'google');
+        $this->mergeConfigFrom(__DIR__.'/config/config.php', 'google');
 
         $this->app['google.api.client'] = $this->app->share(function () {
-            return new Client($this->app->config->get('google::config'));
+            return new Client(config('google'));
         });
     }