Prepare for v1.4 release (#96)

* Prepare for v1.4 release

* Update project dependencies (gradle version, Android plugin version,
build tools, appcompat, GPS, etc);
* Fix Google Maps project API key (old one was no longer working)

* Bump version. Add missing files

* Remove commented line

* Update travis config

* Update gradle plugin version

* Fix gradle config

* Another travis fix

* Fix lint

* Fix lint take 2

.travis.yml

@@ -4,8 +4,8 @@ android:
  components:
  - tools
  - platform-tools
- - build-tools-23.0.2
- - android-23
+ - build-tools-25.0.2
+ - android-25
  - extra-google-google_play_services
  - extra-android-m2repository
  - extra-android-support
@@ -15,7 +15,6 @@ after_success:
  - .buildscript/deploy_snapshot.sh
 
 jdk:
- - oraclejdk7
  - oraclejdk8
 
 branches:

build.gradle

@@ -1,19 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-  repositories {
-  mavenCentral()
-  }
-  dependencies {
-  classpath 'com.android.tools.build:gradle:2.1.0'
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:2.3.0-beta2'
 
-  // NOTE: Do not place your application dependencies here; they belong
-  // in the individual module build.gradle files
-  }
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
+ }
 }
 
 allprojects {
-  repositories {
-  jcenter()
-  }
+ repositories {
+ jcenter()
+ }
 }

gradle.properties

@@ -18,7 +18,7 @@
 # org.gradle.parallel=true
 
 VERSION_CODE=16
-VERSION_NAME=1.3.5-SNAPSHOT
+VERSION_NAME=1.4.0-SNAPSHOT
 GROUP=com.airbnb.android
 
 POM_DESCRIPTION=A view abstraction to provide a map user interface with varying underlying map providers.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Nov 26 13:24:28 PST 2014
+#Wed Jan 18 16:49:18 PST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

library/build.gradle

@@ -2,29 +2,22 @@ apply plugin: 'com.android.library'
 apply from: 'gradle-maven-push.gradle'
 
 android {
- compileSdkVersion 23
- buildToolsVersion "23.0.2"
+ compileSdkVersion 25
+ buildToolsVersion "25.0.2"
 
  defaultConfig {
  minSdkVersion 14
- targetSdkVersion 23
+ targetSdkVersion 25
  }
 
  compileOptions {
  sourceCompatibility JavaVersion.VERSION_1_7
  targetCompatibility JavaVersion.VERSION_1_7
  }
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
 }
 
 dependencies {
- compile 'com.android.support:appcompat-v7:23.2.1'
- compile 'com.google.android.gms:play-services-maps:8.4.0'
+ compile 'com.google.android.gms:play-services-maps:10.0.1'
  compile 'com.google.maps.android:android-maps-utils:0.4'
 
  testCompile 'junit:junit:4.12'

sample/build.gradle

@@ -1,36 +1,26 @@
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion 23
-  buildToolsVersion "23.0.2"
+ compileSdkVersion 25
+ buildToolsVersion "25.0.2"
 
- defaultConfig {
- applicationId "com.airbnb.airmapview.sample"
- minSdkVersion 14
- targetSdkVersion 23
- versionCode 1
- versionName "1.0"
- }
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
-
- signingConfigs {
- debug {
- storeFile file("debug.keystore")
- storePassword "android"
- keyAlias "androiddebugkey"
- keyPassword "android"
- }
- }
+ defaultConfig {
+ applicationId "com.airbnb.airmapview.sample"
+ minSdkVersion 21
+ targetSdkVersion 25
+ versionCode 1
+ versionName "1.0"
+ multiDexEnabled true
+ }
+ lintOptions {
+ disable 'GradleCompatible'
+ }
 }
 
 dependencies {
- compile project(':library')
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support:appcompat-v7:23.2.1'
- compile 'com.android.support:recyclerview-v7:23.2.1'
+ compile project(':library')
+ compile 'com.android.support:multidex:1.0.1'
+ compile 'com.android.support:recyclerview-v7:25.1.0'
+ compile 'com.android.support:appcompat-v7:25.1.0'
+ compile 'com.google.android.gms:play-services:10.0.1'
 }

sample/src/debug/res/values/google_maps_api.xml

@@ -0,0 +1,5 @@
+<resources>
+ <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">
+ AIzaSyDxxG08-MZlZV772EMqzliBRP9b1o_rGvg
+ </string>
+</resources>

sample/src/main/AndroidManifest.xml

@@ -1,63 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.airbnb.airmapview.sample" >
+ package="com.airbnb.airmapview.sample">
 
-  <uses-feature
-  android:glEsVersion="0x00020000"
-  android:required="true" />
+ <uses-feature
+ android:glEsVersion="0x00020000"
+ android:required="true" />
 
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-  <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
- <!-- not needed as of api 23 -->
- <!-- according to https://developers.google.com/maps/documentation/android-api/config it will
+ <!-- not needed as of api 23 -->
+ <!--
+ according to https://developers.google.com/maps/documentation/android-api/config it will
  be removed in a future releaes completely
  -->
- <uses-permission
- android:name="android.permission.WRITE_EXTERNAL_STORAGE"
- android:maxSdkVersion="22" />
-
-
- <application
- android:allowBackup="true"
- android:icon="@mipmap/ic_launcher"
- android:label="@string/app_name"
- android:theme="@style/AppTheme" >
- <activity
- android:name=".MainActivity"
- android:label="@string/app_name" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
-
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
-
- <!--
- DISCLAIMER: The Map Provider API Keys below are for test purposes, therefore not intended
- to be used in production/real apps. Please DO NOT copy-paste it as they may stop working
- at any moment with no further notice
- -->
-
- <!-- Google Maps -->
- <meta-data
- android:name="com.google.android.maps.v2.API_KEY"
- android:value="AIzaSyB129WN9KPdWsTg2Kz0kQ3XheA_nec03XI" />
-
- <!--
+ <uses-permission
+ android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+ android:maxSdkVersion="22" />
+
+ <application
+ android:allowBackup="true"
+ android:icon="@mipmap/ic_launcher"
+ android:label="@string/app_name"
+ android:theme="@style/AppTheme">
+ <activity
+ android:name=".MainActivity"
+ android:label="@string/app_name">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+
+ <meta-data
+ android:name="com.google.android.geo.API_KEY"
+ android:value="AIzaSyDxxG08-MZlZV772EMqzliBRP9b1o_rGvg" />
+
+ <!--
  Mapbox
 
  To get free Mapbox maps for your app, please visit https://www.mapbox.com/signup/
  -->
- <meta-data
- android:name="com.mapbox.ACCESS_TOKEN"
- android:value="pk.eyJ1IjoiYmxlZWdlIiwiYSI6ImZjMDczZjc5N2U0NzFkNWVkYWUzNjkzZTY5NjU4ZDFlIn0.vsxMenwHU5mLe65GULWGQg"/>
-
- <meta-data
- android:name="com.mapbox.MAP_ID"
- android:value="mapbox.streets"/>
+ <meta-data
+ android:name="com.mapbox.ACCESS_TOKEN"
+ android:value="pk.eyJ1IjoiYmxlZWdlIiwiYSI6ImZjMDczZjc5N2U0NzFkNWVkYWUzNjkzZTY5NjU4ZDFlIn0.vsxMenwHU5mLe65GULWGQg" />
+ <meta-data
+ android:name="com.mapbox.MAP_ID"
+ android:value="mapbox.streets" />
 
-  </application>
+ </application>
 
-</manifest>
+</manifest>

sample/src/main/res/values/strings.xml

@@ -1,7 +1,8 @@
 <resources>
-  <string name="app_name">AirMapView Sample</string>
+ <string name="app_name">AirMapView Sample</string>
 
- <string name="hello_world">Hello world!</string>
- <string name="action_settings">Settings</string>
+ <string name="hello_world">Hello world!</string>
+ <string name="action_settings">Settings</string>
+ <string name="title_activity_maps">Map</string>
 
 </resources>

sample/src/release/res/values/google_maps_api.xml

@@ -0,0 +1,5 @@
+<resources>
+ <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">
+ AIzaSyDxxG08-MZlZV772EMqzliBRP9b1o_rGvg
+ </string>
+</resources>