Merge pull request #411 from anthonycr/dev

4.3.0 Release

.gitignore

@@ -50,3 +50,5 @@ out
 # Source:
 # https://raw.githubusercontent.com/github/gitignore/master/Android.gitignore
 # https://gitlab.com/fdroid/fdroidclient/raw/master/.gitignore
+
+*.iml

.travis.yml

@@ -2,8 +2,9 @@ language: android
 sudo: false
 android:
   components:
+    - tools
+    - build-tools-23.0.3
     - build-tools-22.0.1
-    - build-tools-23.0.1
     - android-23
     - android-22
     - extra-android-support
@@ -17,3 +18,4 @@ before_install:
 install:
   - ./gradlew
 script:
+  - ./gradlew assembleDebug --stacktrace

README.md

@@ -4,7 +4,11 @@
 ####Download
 * [Download APK from here](https://github.com/anthonycr/Lightning-Browser/releases)
 
-* [Download from Google Play](https://play.google.com/store/apps/details?id=acr.browser.barebones)
+* [Download from F-Droid](https://f-droid.org/repository/browse/?fdfilter=lightning&fdid=acr.browser.lightning)
+
+* [Download Free from Google Play](https://play.google.com/store/apps/details?id=acr.browser.barebones)
+
+* [Download Paid from Google Play](https://play.google.com/store/apps/details?id=acr.browser.lightning)
 
 ####Master Branch
 * [![Build Status](https://travis-ci.org/anthonycr/Lightning-Browser.svg?branch=master)](https://travis-ci.org/anthonycr/Lightning-Browser)
@@ -46,12 +50,14 @@
 * Please add translations/translation fixes as you see need
 
 ####Contributing
+* [The Trello Board](https://trello.com/b/Gwjx8MC3/lightning-browser)
 * Contributions are always welcome
 * If you want a feature and can code, feel free to fork and add the change yourself and make a pull request
 * PLEASE use the ````dev```` branch when contributing as the ````master```` branch is supposed to be for stable builds. I will not reject your pull request if you make it on master, but it will annoy me and make my life harder.
 * Code Style
-    * Standard Java camel case
-    * Member variables are preceded with an 'm'
+    * Hungarian Notation
+         * Prefix member variables with 'm'
+         * Prefix static member variables with 's'
     * Use 4 spaces instead of a tab (\t)
 
 ####Setting Up the Project

app/build.gradle

@@ -1,18 +1,27 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.neenbedankt.android-apt'
+apply plugin: 'com.getkeepsafe.dexcount'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.3"
+
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionName "4.2.3a"
+        versionName "4.3.3"
+        generatedDensities = []
+    }
+
+    aaptOptions {
+        additionalParameters "--no-version-vectors"
     }
+
     sourceSets {
         lightningPlus.setRoot('src/LightningPlus')
         lightningLite.setRoot('src/LightningLite')
     }
+
     buildTypes {
         debug {
             minifyEnabled false
@@ -26,44 +35,73 @@ android {
             proguardFiles 'proguard-project.txt'
         }
     }
+
     productFlavors {
         lightningPlus {
             buildConfigField "boolean", "FULL_VERSION", "true"
             applicationId "acr.browser.lightning"
-            versionCode 84
+            versionCode 88
         }
+
         lightningLite {
             buildConfigField "boolean", "FULL_VERSION", "false"
             applicationId "acr.browser.barebones"
-            versionCode 85
+            versionCode 90
         }
     }
+
     lintOptions {
-        abortOnError false
+        abortOnError true
+    }
+
+    packagingOptions {
+        exclude '.readme'
     }
 }
 
+dexcount {
+    includeClasses = false
+    includeFieldCount = false
+    printAsTree = true
+    orderByMethodCount = true
+    verbose = false
+}
+
 dependencies {
-    compile 'com.android.support:palette-v7:23.0.1'
-    compile 'com.android.support:appcompat-v7:23.0.1'
-    compile 'com.android.support:design:23.0.1'
-    compile 'com.android.support:recyclerview-v7:23.0.1'
-    compile 'org.jsoup:jsoup:1.8.3'
+
+    // support libraries
+    compile 'com.android.support:palette-v7:23.3.0'
+    compile 'com.android.support:appcompat-v7:23.3.0'
+    compile 'com.android.support:design:23.3.0'
+    compile 'com.android.support:recyclerview-v7:23.3.0'
+    compile 'com.android.support:support-v4:23.3.0'
+
+    // html parsing fo reading mode
+    compile 'org.jsoup:jsoup:1.9.1'
+
+    // event bus
     compile 'com.squareup:otto:1.3.8'
-    compile 'com.google.dagger:dagger:2.0.1'
-    apt 'com.google.dagger:dagger-compiler:2.0.1'
+
+    // dependency injection
+    compile 'com.google.dagger:dagger:2.0.2'
+    apt 'com.google.dagger:dagger-compiler:2.0.2'
+
+    // view binding
     compile 'com.jakewharton:butterknife:7.0.1'
 
-    // Only Lightning Plus needs the proxy libraries
-    compile 'net.i2p.android:client:0.7'
+    // permissions
+    compile 'com.anthonycr.grant:permissions:1.1.2'
+
+    // proxy support
+    compile 'net.i2p.android:client:0.8'
 
     // Use the following code to update the libnetcipher submodule
     // git submodule foreach git reset --hard
     // git submodule update --remote
-    compile(project(':libnetcipher'))
-
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1'
+    compile project(':libnetcipher')
 
+    // memory leak analysis
+    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta2'
+    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'
     provided 'javax.annotation:jsr250-api:1.0'
 }