From 571e7ebff3ffdc5e4b6c8780269e59237f34853d Mon Sep 17 00:00:00 2001
From: Aidan Follestad <afollestad@squareup.com>
Date: Thu, 24 Jan 2019 16:03:12 -0800
Subject: [PATCH] Pull Fabric props from environment variables, default to 0
 which stops build failures

---
 .editorconfig                       |  3 ---
 .idea/misc.xml                      |  2 +-
 app/build.gradle                    | 13 +-----------
 app/src/release/AndroidManifest.xml | 14 -------------
 fabric.gradle                       | 32 +++++++++++++++++++++++++++++
 5 files changed, 34 insertions(+), 30 deletions(-)
 delete mode 100644 .editorconfig
 delete mode 100644 app/src/release/AndroidManifest.xml
 create mode 100644 fabric.gradle

diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index 17bc1fa..0000000
--- a/.editorconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-[*.kt]
-indent_size = 2
-continuation_indent_size=4
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9d1e235..50f0406 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -40,7 +40,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 6b0bbbe..efff452 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,17 +4,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 
-apply plugin: 'io.fabric'
-
-def getFabricApiKey() {
-  def propsFile = project.rootProject.file('local.properties')
-  if (!propsFile.exists()) {
-    return ""
-  }
-  Properties properties = new Properties()
-  properties.load(propsFile.newDataInputStream())
-  return properties.getProperty("fabric.apikey") ?: ""
-}
+apply from: '../fabric.gradle'
 
 android {
   compileSdkVersion versions.compileSdk
@@ -26,7 +16,6 @@ android {
     targetSdkVersion versions.compileSdk
     versionCode versions.publishVersionCode
     versionName versions.publishVersion
-    manifestPlaceholders = [fabricKey:getFabricApiKey()]
   }
 
   buildTypes {
diff --git a/app/src/release/AndroidManifest.xml b/app/src/release/AndroidManifest.xml
deleted file mode 100644
index f557bb7..0000000
--- a/app/src/release/AndroidManifest.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.afollestad.nocknock">
-
-  <application>
-
-    <meta-data
-        android:name="io.fabric.ApiKey"
-        android:value="${fabricKey}"/>
-
-  </application>
-
-</manifest>
diff --git a/fabric.gradle b/fabric.gradle
new file mode 100644
index 0000000..8303700
--- /dev/null
+++ b/fabric.gradle
@@ -0,0 +1,32 @@
+apply plugin: 'io.fabric'
+
+ext.getFabricApiKey = {
+  return System.getenv('FABRIC_APIKEY') ?: "0"
+}
+
+ext.getFabricApiSecret = {
+  return System.getenv('FABRIC_APISECRET') ?: "0"
+}
+
+def buildFabricProperties() {
+  def propertiesFile = file("fabric.properties")
+  def apiSecret = getFabricApiSecret()
+  def apiKey = getFabricApiKey()
+
+  if (apiSecret == "0" || apiKey == "0") {
+    logger.warn("API key and/or secret env variables not found, defaulting to 0.")
+  }
+  if (propertiesFile.exists()) {
+    propertiesFile.delete()
+  }
+
+  def commentMessage = "suppress inspection \"UnusedProperty\" for whole file"
+  ant.propertyfile(file: "fabric.properties", comment: commentMessage) {
+    entry(key: "apiSecret", value: apiSecret)
+    entry(key: "apiKey", value: apiKey)
+  }
+}
+
+afterEvaluate {
+  buildFabricProperties()
+}
\ No newline at end of file