Merge branch 'release-1.0.7'

README.md

@@ -13,13 +13,6 @@ Download the [latest release] [2] as a `*.jar` file and add it to your app's `li
 adding the dependency to your classpath. You're already good to go now. If you want more from life than simplicity: read
 [this] [3].
 
-## Usage
-
-There is a sample application available that covers the library's basic use cases. You can find the source code in the
-`sample/` folder. In case you're wondering about the unusual project structure: the app is built with `sbt`. Just head
-to the source folder and everything is back to normal. If you feel like running the sample app on your device but having
-trouble building it then there's an `*.apk` in the download section waiting for you to give it a try.
-
 ### Request
 
 `GET`, `POST`, `PUT`, `DELETE` or `HEAD` requests are called via `com.taig.communicator.method.Method`.
@@ -201,4 +194,4 @@ the requested content any more. Also don't forget to shut down the executor when
 [1]: http://android-developers.blogspot.de/2011/09/androids-http-clients.html
 [2]: http://developer.android.com/about/dashboards/index.html#Platform
 [3]: https://github.com/Taig/Communicator/releases
-[4]: http://tools.android.com/recent/dealingwithdependenciesinandroidprojects
+[4]: http://tools.android.com/recent/dealingwithdependenciesinandroidprojects

proguard-sbt.txt

@@ -0,0 +1,59 @@
+# This is a configuration file for ProGuard.
+# http://proguard.sourceforge.net/index.html#manual/usage.html
+
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-verbose
+
+# Optimization is turned off by default. Dex does not like code run
+# through the ProGuard optimize and preverify steps (and performs some
+# of these optimizations on its own).
+-dontoptimize
+-dontpreverify
+# Note that if you want to enable optimization, you cannot just
+# include optimization flags in your own project configuration file;
+# instead you will need to point to the
+# "proguard-android-optimize.txt" file instead of this one from your
+# project.properties file.
+
+-keepattributes *Annotation*
+-keep public class com.google.vending.licensing.ILicensingService
+-keep public class com.android.vending.licensing.ILicensingService
+
+# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
+-keepclasseswithmembernames class * {
+ native <methods>;
+}
+
+# keep setters in Views so that animations can still work.
+# see http://proguard.sourceforge.net/manual/examples.html#beans
+-keepclassmembers public class * extends android.view.View {
+ void set*(***);
+ *** get*();
+}
+
+# We want to keep methods in Activity that could be used in the XML attribute onClick
+-keepclassmembers class * extends android.app.Activity {
+ public void *(android.view.View);
+}
+
+# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
+-keepclassmembers enum * {
+ public static **[] values();
+ public static ** valueOf(java.lang.String);
+}
+
+-keep class * implements android.os.Parcelable {
+ public static final android.os.Parcelable$Creator *;
+}
+
+-keepclassmembers class **.R$* {
+ public static <fields>;
+}
+
+# The support library contains references to newer platform versions.
+# Don't warn about those in case this app is linking against an older
+# platform version. We know about them, and they are safe.
+-dontwarn android.support.**
+# view AndroidManifest.xml #generated:7
+-keep class android.test.InstrumentationTestRunner { <init>(...); }

project/Build.scala

@@ -8,10 +8,11 @@ object Build extends android.AutoBuild
 		.settings(
 			autoScalaLibrary := false,
 			exportJars := true,
-			libraryDependencies += "com.google.android" % "android" % "4.4" % "provided" from ( "file://" + System.getenv( "ANDROID_HOME" ) + "/platforms/android-19/android.jar" ),
-			name := "communicator",
+			name := "Communicator",
 			organization := "com.taig.android",
 			scalaVersion := "2.11.2",
-			version := "1.0.6"
-	)
-}
+			version := "1.0.7",
+			minSdkVersion in Android := "10",
+			targetSdkVersion in Android := "19"
+		)
+}