From e0b4c08b781bfaa015820934186e44b7313a3f3a Mon Sep 17 00:00:00 2001
From: RikkaW <s574204775@gmail.com>
Date: Tue, 29 Dec 2015 16:10:31 +0800
Subject: [PATCH] remove google safe search switch for play version

---
 .idea/misc.xml   | 2 +-
 app/build.gradle | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index fbb6828..5d19981 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" 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 9ff2726..3985e80 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,9 +5,10 @@ android {
     buildToolsVersion "23.0.2"
 
     defaultConfig {
+        applicationId "rikka.searchbyimage2"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 12001
+        versionCode 12002
         versionName "1.2"
     }
     buildTypes {
@@ -19,12 +20,11 @@ android {
 
     productFlavors {
         COOLAPK {
-            applicationId "rikka.searchbyimage2"
             buildConfigField "boolean", "hideOtherEngine", "false"
         }
 
         GOOGLE {
-            applicationId "rikka.searchbyimage2"
+            versionName "1.2-play"
             buildConfigField "boolean", "hideOtherEngine", "true"
         }
     }
@@ -35,7 +35,6 @@ android {
                 output.outputFile = file("${output.outputFile.parent}/searchbyimage" +
                         "-${variant.buildType.name.toLowerCase()}" +
                         "-${variant.versionName}" +
-                        "-${variant.flavorName.toLowerCase()}" +
                         ".apk")
             }
         }