From 7d1173013fbcbbe9ab80f734d438e02bec6e6170 Mon Sep 17 00:00:00 2001 From: Christian Wilcox Date: Fri, 8 May 2015 07:13:35 -0500 Subject: [PATCH 1/5] removed placeholder values in prefs_headers.xml --- res/xml/pref_headers.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/res/xml/pref_headers.xml b/res/xml/pref_headers.xml index 05e1241..5df1111 100644 --- a/res/xml/pref_headers.xml +++ b/res/xml/pref_headers.xml @@ -3,13 +3,13 @@
\ No newline at end of file From 87801f99e295cdff1e167b30d7ade0d123250851 Mon Sep 17 00:00:00 2001 From: Christian Wilcox Date: Fri, 8 May 2015 07:14:31 -0500 Subject: [PATCH 2/5] updated webview interface name in proguard-project.txt --- proguard-project.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proguard-project.txt b/proguard-project.txt index 02cf0c6..18959ac 100644 --- 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 *; } From c23366b4f96d942e7018c7db5c89937df3eda95f Mon Sep 17 00:00:00 2001 From: Christian Wilcox Date: Fri, 8 May 2015 07:15:26 -0500 Subject: [PATCH 3/5] added .DS_Store to .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 529bbfa..4476383 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,6 @@ local.properties # Proguard folder generated by Eclipse proguard/ proguard_logs/ + +# Mac directory index +*.DS_Store From 3b91425c6ab1966a0ba08dc13735afc79bbf44ea Mon Sep 17 00:00:00 2001 From: Christian Wilcox Date: Fri, 8 May 2015 07:17:11 -0500 Subject: [PATCH 4/5] Fixes #21; targetSdkVersion to latest; bump app version --- AndroidManifest.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index cd6489d..2b8e6c1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,13 +1,13 @@ + android:installLocation="auto" + android:versionCode="8" + android:versionName="1.3.4" > + android:targetSdkVersion="22" /> @@ -41,4 +41,4 @@ - \ No newline at end of file + From 383bb6de2ff535bdb1873f7207238f2719ff805c Mon Sep 17 00:00:00 2001 From: Christian Wilcox Date: Fri, 8 May 2015 21:35:56 -0500 Subject: [PATCH 5/5] updated gradle build files --- build.gradle | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 1251a29..a0d7fb4 100644 --- a/build.gradle +++ b/build.gradle @@ -3,18 +3,18 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.9.+' + classpath 'com.android.tools.build:gradle:1.0.0' } } -apply plugin: 'android' +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 @@ -62,7 +62,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 index b231a44..be6142e 100644 --- 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