bugsnag · kattrali · Jan 18, 2016 · Jan 4, 2016 · Jan 5, 2016 · Jan 5, 2016
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -32,13 +32,13 @@ installed to `~/.android-sdk`.
 Building the Library
 ---------------------
 
-You can build new `.jar` and `.aar` files as follows:
+You can build new `.aar` files as follows:
 
 ```shell
 ./gradlew clean :build
 ```
 
-Files are generated into `build/outputs/jar` and `build/outputs/aar`.
+Files are generated into`build/outputs/aar`.
 
 
 Running Tests
@@ -128,7 +128,7 @@ This process is a little ridiculous...
     -   Select the com.bugsnag closed repository
     -   Click the “release” button in the toolbar
 
-### 4. Upload the .jar file to GitHub
+### 4. Upload the .aar file to GitHub
 
 -   Create a "release" from your new tag on [GitHub Releases](https://github.com/bugsnag/bugsnag-android/releases)
--   Upload the generated `.jar` file from `build/outputs/jar/bugsnag-android-x.y.z.jar` on the "edit tag" page for this release tag
+-   Upload the generated `.aar` file from `build/outputs/aar/bugsnag-android-release.aar` on the "edit tag" page for this release tag
diff --git a/README.md b/README.md
@@ -32,12 +32,6 @@ Add `bugsnag-android` as a dependency in your `pom.xml`:
 </dependency>
 ```
 
-### Using a Jar
-
--   Download the [latest bugsnag-android.jar](https://github.com/bugsnag/bugsnag-android/releases/latest)
--   Place it in your Android app's `libs/` folder
-
-
 Configuring Your AndroidManifest
 --------------------------------
 
@@ -49,13 +43,12 @@ Configuring Your AndroidManifest
     </application>
     ```
 
--   Enable the `INTERNET`, `ACCESS_NETWORK_STATE` and `GET_TASKS` permissions:
+-   Recommended: Enable the `ACCESS_NETWORK_STATE` and `GET_TASKS` permissions:
 
     ```xml
-    <!-- Required: Used to deliver Bugsnag crash reports -->
-    <uses-permission android:name="android.permission.INTERNET"/>
     <!-- Optional: To provide network connectivity information to Bugsnag -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
     <!-- Optional: To see which Activity was active at the time of a crash -->
     <uses-permission android:name="android.permission.GET_TASKS"/>
     ```

diff --git a/build.gradle b/build.gradle
@@ -19,38 +19,13 @@ android {
     defaultConfig {
         minSdkVersion 4
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFile 'proguard.txt'
-        }
+        consumerProguardFiles 'proguard.txt'
     }
 
     lintOptions {
         disable 'DefaultLocale'
     }
 }
 
-// Task to generate a .jar file
-task jarRelease(type: Copy) {
-    def jarFile = POM_ARTIFACT_ID + '-' + VERSION_NAME + '.jar'
-
-    from 'build/intermediates/bundles/release/'
-    into 'build/outputs/jar'
-    include 'classes.jar'
-    rename('classes.jar', jarFile)
-
-    artifacts.add('archives', file('build/outputs/jar/' + jarFile));
-}
-
-// Generate .jar files when assembling release builds
-tasks.whenTaskAdded { task ->
-    if (task.name == 'signArchives') {
-        task.dependsOn jarRelease
-    }
-}
-
 // Tasks to release the library to maven central
 apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
diff --git a/example/build.gradle b/example/build.gradle
@@ -16,14 +16,12 @@ android {
     buildTypes {
 
         debug {
-            minifyEnabled true
-            proguardFile 'proguard.pro'
             applicationIdSuffix ".debug"
         }
 
         release {
             minifyEnabled true
-            proguardFile 'proguard.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.pro'
         }
     }
 

diff --git a/example/proguard.pro b/example/proguard.pro
@@ -1,2 +1,17 @@
--keepattributes LineNumberTable,SourceFile
--dontoptimize
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in <android-sdk>/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# 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 {
+#   public *;
+#}
diff --git a/example/src/main/AndroidManifest.xml b/example/src/main/AndroidManifest.xml
@@ -16,7 +16,6 @@
         <meta-data android:name="com.bugsnag.android.API_KEY" android:value="066f5ad3590596f9aa8d601ea89af845"/>
     </application>
 
-    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.GET_TASKS" />
 </manifest>
diff --git a/gradle.properties b/gradle.properties
@@ -14,7 +14,7 @@ POM_NAME=Bugsnag Android
 POM_DESCRIPTION=Official Bugsnag notifier for Android applications
 POM_URL=https://bugsnag.com
 POM_ARTIFACT_ID=bugsnag-android
-POM_PACKAGING=jar
+POM_PACKAGING=aar
 
 ANDROID_BUILD_TARGET_SDK_VERSION=19
 ANDROID_BUILD_TOOLS_VERSION=21.1.1

diff --git a/proguard.txt b/proguard.txt
@@ -1,32 +1,19 @@
--dontobfuscate
+-keeppackagenames com.bugsnag.**
+-keepnames class com.bugsnag.**
+-keepclassmembernames class com.bugsnag.** { *; }
 
--renamesourcefileattribute SourceFile
 -keepattributes Exceptions,InnerClasses,Signature,Deprecated,
                 SourceFile,LineNumberTable,*Annotation*,EnclosingMethod
 
--keep public class * {
+-keep public class com.bugsnag.** {
     public protected *;
 }
 
 -keep class com.bugsnag.android.Async {
     static void run(java.lang.Runnable);
 }
 
--keepclassmembernames class * {
-    java.lang.Class class$(java.lang.String);
-    java.lang.Class class$(java.lang.String, boolean);
-}
-
--keepclasseswithmembernames class * {
-    native <methods>;
-}
-
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
--keepclassmembers class * implements java.io.Serializable {
+-keepclassmembers class com.bugsnag.** implements java.io.Serializable {
     static final long serialVersionUID;
     private static final java.io.ObjectStreamField[] serialPersistentFields;
     private void writeObject(java.io.ObjectOutputStream);

diff --git a/src/androidTest/AndroidManifest.xml b/src/androidTest/AndroidManifest.xml
@@ -4,7 +4,6 @@
   android:versionCode="1"
   android:versionName="1.0" >
 
-  <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.GET_TASKS" />
 

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
@@ -2,6 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.bugsnag.android"
   android:versionCode="1"
-  android:versionName="1.0" >
+  android:versionName="1.0">
+
+  <!-- Required: Used to deliver Bugsnag crash reports -->
+  <uses-permission android:name="android.permission.INTERNET" />
 
 </manifest>