Update Gradle version

jd-alexander · Apr 11, 2015 · fd0288b · fd0288b
1 parent 0e1d3cd
commit fd0288b
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 84 deletions.
diff --git a/build.gradle b/build.gradle
@@ -0,0 +1,17 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.1.0'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
diff --git a/example/AndroidManifest.xml b/example/AndroidManifest.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.directions.android"
-          android:versionCode="1"
-          android:versionName="1.0">
+    package="com.directions.android"
+    android:versionCode="1"
+    android:versionName="1.0">
     <!-- Copied from Google Maps Library/AndroidManifest.xml. -->
-    <uses-sdk
-            android:minSdkVersion="8"
-            android:targetSdkVersion="17"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
     <!-- External storage for caching. -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <!-- My Location -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <!-- Maps API needs OpenGL ES 2.0. -->
     <uses-feature
-            android:glEsVersion="0x00020000"
-            android:required="true"/>
+        android:glEsVersion="0x00020000"
+        android:required="true" />
     <!-- End of copy. -->
-    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
-    <meta-data
-                android:name="com.google.android.maps.v2.API_KEY"
-                android:value="XXX-Key"/>
-        <activity android:name="MyActivity"
-                  android:label="@string/app_name">
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name">
+        <meta-data
+            android:name="com.google.android.maps.v2.API_KEY"
+            android:value="XXX-Key" />
+        <activity
+            android:name="MyActivity"
+            android:label="@string/app_name">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>

diff --git a/example/build.gradle b/example/build.gradle
@@ -1,30 +1,17 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.8.+'
-    }
-}
-
-apply plugin: 'android'
-
-repositories {
-    mavenCentral()
-}
+apply plugin: 'com.android.application'
 
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
     compile project(':library')
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19'
+    compileSdkVersion 21
+    buildToolsVersion '21.1.2'
 
     defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 19
+        minSdkVersion 14
+        targetSdkVersion 21
     }
 
     signingConfigs {
@@ -74,8 +61,7 @@ android {
     buildTypes {
         ProdRelease {
             debuggable false
-            jniDebugBuild false
-            runProguard false
+            minifyEnabled false
             proguardFile file('proguard-project.txt')
             signingConfig signingConfigs.release
         }

diff --git a/example/src/com/directions/android/MyActivity.java b/example/src/com/directions/android/MyActivity.java
@@ -4,6 +4,7 @@
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 
+import com.directions.route.Route;
 import com.directions.route.Routing;
 import com.directions.route.RoutingListener;
 import com.google.android.gms.maps.CameraUpdate;
@@ -15,23 +16,23 @@
 import com.google.android.gms.maps.model.MarkerOptions;
 import com.google.android.gms.maps.model.PolylineOptions;
 
-public class MyActivity extends FragmentActivity implements RoutingListener
-{
+public class MyActivity extends FragmentActivity implements RoutingListener {
     protected GoogleMap map;
     protected LatLng start;
     protected LatLng end;
+
     /**
      * This activity loads a map and then displays the route and pushpins on it.
      */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
-        SupportMapFragment fm = (SupportMapFragment)  getSupportFragmentManager().findFragmentById(R.id.map);
+        SupportMapFragment fm = (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map);
         map = fm.getMap();
 
-        CameraUpdate center=CameraUpdateFactory.newLatLng(new LatLng(18.013610,-77.498803));
-        CameraUpdate zoom=  CameraUpdateFactory.zoomTo(15);
+        CameraUpdate center = CameraUpdateFactory.newLatLng(new LatLng(18.013610, -77.498803));
+        CameraUpdate zoom = CameraUpdateFactory.zoomTo(15);
 
         map.moveCamera(center);
         map.animateCamera(zoom);
@@ -47,32 +48,33 @@ public void onCreate(Bundle savedInstanceState) {
 
     @Override
     public void onRoutingFailure() {
-      // The Routing request failed
+        // The Routing request failed
     }
 
     @Override
     public void onRoutingStart() {
-      // The Routing Request starts
+        // The Routing Request starts
     }
 
     @Override
-    public void onRoutingSuccess(PolylineOptions mPolyOptions) {
-      PolylineOptions polyoptions = new PolylineOptions();
-      polyoptions.color(Color.BLUE);
-      polyoptions.width(10);
-      polyoptions.addAll(mPolyOptions.getPoints());
-      map.addPolyline(polyoptions);
+    public void onRoutingSuccess(PolylineOptions mPolyOptions, Route route) {
+        PolylineOptions polyOptions = new PolylineOptions();
+        polyOptions.color(Color.BLUE);
+        polyOptions.width(10);
+        polyOptions.addAll(mPolyOptions.getPoints());
+        map.addPolyline(polyOptions);
 
-      // Start marker
-      MarkerOptions options = new MarkerOptions();
-      options.position(start);
-      options.icon(BitmapDescriptorFactory.fromResource(R.drawable.start_blue));
-      map.addMarker(options);
+        // Start marker
+        MarkerOptions options = new MarkerOptions();
+        options.position(start);
+        options.icon(BitmapDescriptorFactory.fromResource(R.drawable.start_blue));
+        map.addMarker(options);
 
-      // End marker
-      options = new MarkerOptions();
-      options.position(end);
-      options.icon(BitmapDescriptorFactory.fromResource(R.drawable.end_green));  
-      map.addMarker(options);
+        // End marker
+        options = new MarkerOptions();
+        options.position(end);
+        options.icon(BitmapDescriptorFactory.fromResource(R.drawable.end_green));
+        map.addMarker(options);
     }
+
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
@@ -3,9 +3,6 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="15" />
  <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <application

diff --git a/library/build.gradle b/library/build.gradle
@@ -1,23 +1,18 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath ('com.android.tools.build:gradle:0.8.+') {
-            exclude module: 'support-v4'
-        }
-    }
-}
-apply plugin: 'android-library'
+apply plugin: 'com.android.library'
 
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
-    compile 'com.google.android.gms:play-services:3.2.+'
+    compile 'com.google.android.gms:play-services:7.0.0'
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "19"
+    compileSdkVersion 21
+    buildToolsVersion "21.1.2"
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 19
+    }
 
     sourceSets {
         main {