Merge tag 'v1.3.4'

Conflicts: build.gradle
cw · May 9, 2015 · 69a15c4 · 69a15c4
2 parents 9e76f46 + 383bb6d
commit 69a15c4
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,6 @@ local.properties
 # Proguard folder generated by Eclipse
 proguard/
 proguard_logs/
+
+# Mac directory index
+*.DS_Store
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="biz.codefuture.svgviewer"
-    android:installLocation="preferExternal"
-    android:versionCode="7"
-    android:versionName="1.3.3" >
+    android:installLocation="auto"
+    android:versionCode="8"
+    android:versionName="1.3.4" >
 
     <uses-sdk
         android:minSdkVersion="12"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="22" />
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -38,4 +38,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>
diff --git a/build.gradle b/build.gradle
@@ -3,21 +3,18 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.9.+'
-        classpath 'org.notlocalhost.gradle:gradle-calabash-android-plugin:0.1.+'
+        classpath 'com.android.tools.build:gradle:1.0.0'
     }
 }
-apply plugin: 'android'
-apply plugin: 'calabash-test'
+apply plugin: 'com.android.application'
 
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
-
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "19.0.3"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
 
     lintOptions {
         abortOnError false
@@ -67,7 +64,7 @@ android {
             signingConfig signingConfigs.debug
         }
         release {
-            runProguard true
+            minifyEnabled true
             //proguardFile proguard-project.txt
             signingConfig signingConfigs.release
         }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Apr 05 14:45:45 CDT 2014
+#Thu May 07 21:22:09 CDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/proguard-project.txt b/proguard-project.txt
@@ -15,6 +15,6 @@
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface
 # class:
--keepclassmembers class fqcn.of.javascript.interface.for.webview {
+-keepclassmembers class biz.codefuture.svgviewer.MainActivity.webview {
    public *;
 }
diff --git a/res/xml/pref_headers.xml b/res/xml/pref_headers.xml
@@ -3,13 +3,13 @@
     <!-- These settings headers are only used on tablets. -->
 
     <header
-        android:fragment="${packageName}.${activityClass}$GeneralPreferenceFragment"
+        android:fragment="biz.codefuture.svgviewer.SettingsActivity$GeneralPreferenceFragment"
         android:title="@string/pref_header_general" />
     <header
-        android:fragment="${packageName}.${activityClass}$NotificationPreferenceFragment"
+        android:fragment="biz.codefuture.svgviewer.SettingsActivity$NotificationPreferenceFragment"
         android:title="@string/pref_header_notifications" />
     <header
-        android:fragment="${packageName}.${activityClass}$DataSyncPreferenceFragment"
+        android:fragment="biz.codefuture.svgviewer.SettingsActivity$DataSyncPreferenceFragment"
         android:title="@string/pref_header_data_sync" />
 
 </preference-headers>