Merge pull request #15 from cutmail/develop

Release 2017-03-16 17:43:24 +0900

.circle/google-services.json

@@ -0,0 +1,42 @@
+{
+  "project_info": {
+    "project_number": "1075787015943",
+    "firebase_url": "https://disasterapp-test.firebaseio.com",
+    "project_id": "disasterapp-test",
+    "storage_bucket": "disasterapp-test.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:1075787015943:android:7a9c8ad5cd11cfb9",
+        "android_client_info": {
+          "package_name": "me.cutmail.disasterapp"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "1075787015943-mfr32qpj7qu5qehvhcpafpoui7i4au5v.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDV9TOqaAdRXAo7EP2oqYFUImTNPeShsm8"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

.circle/setup-fabric-properties.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+echo "apiSecret=$FABRIC_API_SECRET" >> app/fabric.properties
+echo "apiKey=$FABRIC_API_KEY" >> app/fabric.properties

.gitignore

@@ -14,6 +14,7 @@ gen/
 out/
 
 local.properties
+.envrc
 
 # Eclipse project files
 .classpath
@@ -36,4 +37,8 @@ local.properties
 res/values/com_crashlytics_export_strings.xml
 app/src/main/res/values/com_crashlytics_export_strings.xml
 app/src/main/assets/crashlytics-build.properties
+app/fabric.properties
 build/
+
+# Google
+app/google-services.json

README.md

@@ -1,2 +1,3 @@
-# DisasterApp
-[![Circle CI](https://circleci.com/gh/cutmail/DisasterApp.svg?style=svg&circle-token=aca35c19913a54428255dc159c451940ec05c5a2)](https://circleci.com/gh/cutmail/DisasterApp)
+# ![](app/src/main/res/drawable-xhdpi/ic_launcher.png) 地震・災害情報 [![CircleCI](https://circleci.com/gh/cutmail/DisasterApp/tree/develop.svg?style=svg&circle-token=aca35c19913a54428255dc159c451940ec05c5a2)](https://circleci.com/gh/cutmail/DisasterApp/tree/develop)
+
+<a href="https://play.google.com/store/apps/details?id=me.cutmail.disasterapp"><img width="200" alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/apps/ja-play-badge.png" /></a>

app/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'io.fabric.tools:gradle:1.19.1'
+        classpath 'io.fabric.tools:gradle:1.21.6'
     }
 }
 apply plugin: 'com.android.application'
@@ -17,22 +17,14 @@ repositories {
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "24.0.3"
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "me.cutmail.disasterapp"
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 16
-        versionName "1.6.1"
-        jackOptions {
-            enabled true
-        }
+        versionCode 17
+        versionName "1.7.0"
     }
     buildTypes {
         release {
@@ -42,15 +34,17 @@ android {
 }
 
 dependencies {
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
+    compile('com.crashlytics.sdk.android:crashlytics:2.6.7@aar') {
         transitive = true;
     }
-    compile 'com.android.support:appcompat-v7:25.0.0'
-    compile 'com.jakewharton:butterknife:8.4.0'
-    compile 'com.jakewharton.timber:timber:4.3.1'
+    compile 'com.android.support:appcompat-v7:25.0.1'
+    compile 'com.jakewharton.timber:timber:4.5.1'
     compile 'com.github.hotchemi:android-rate:1.0.1'
     compile 'com.firebaseui:firebase-ui-database:0.6.1'
-    compile 'com.google.firebase:firebase-database:9.6.1'
+    compile 'com.google.firebase:firebase-database:10.0.1'
+    compile 'com.google.firebase:firebase-core:10.0.1'
+    compile 'com.google.firebase:firebase-crash:10.0.1'
+    compile 'com.jakewharton:butterknife:8.5.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
 }
 

app/src/main/AndroidManifest.xml

@@ -27,10 +27,6 @@
             </intent-filter>
         </activity>
 
-        <meta-data
-            android:name="com.crashlytics.ApiKey"
-            android:value="7d0f3ef6938723ac69b416c2f9d0cfa7f9ae7437" />
-
         <activity
             android:name=".activity.EntryDetailActivity"
             android:label="@string/title_activity_entry_detail" />

app/src/main/java/me/cutmail/disasterapp/DisasterApplication.java

@@ -4,6 +4,7 @@
 import android.util.Log;
 
 import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crash.FirebaseCrash;
 import com.google.firebase.database.FirebaseDatabase;
 
 import timber.log.Timber;
@@ -38,6 +39,7 @@ protected void log(int priority, String tag, String message, Throwable t) {
 
             if (t != null) {
                 Crashlytics.getInstance().core.logException(t);
+                FirebaseCrash.report(t);
             }
         }
     }

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath 'com.google.gms:google-services:3.0.0'

circle.yml

@@ -13,10 +13,15 @@ machine:
         LC_ALL: en_US.UTF-8
         JAVA_OPTS: "-Xmx2048m -XX:MaxPermSize=1024m"
 
+checkout:
+  post:
+    - cp .circle/google-services.json app/google-services.json
+    - .circle/setup-fabric-properties.sh
+
 dependencies:
   pre:
-    - echo y | android update sdk --no-ui --all --filter "tools,platform-tools,android-24,extra-android-support,extra-android-m2repository,extra-google-m2repository,extra-google-google_play_services"
-    - echo y | android update sdk --no-ui --all --filter "build-tools-24.0.3"
+    - echo y | android update sdk --no-ui --all --filter "tools,platform-tools,android-25,extra-android-support,extra-android-m2repository,extra-google-m2repository,extra-google-google_play_services"
+    - echo y | android update sdk --no-ui --all --filter "build-tools-25.0.2"
   cache_directories:
     - ~/.android
   override:

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Oct 15 13:12:36 JST 2016
+#Thu Mar 16 16:34:07 JST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip