Merge pull request #597 from anthonycr/dev

Version 4.5.1

.travis.yml

@@ -5,8 +5,8 @@ jdk:
 android:
   components:
     - tools
-    - build-tools-25.0.3
-    - android-25
+    - build-tools-26.0.0
+    - android-26
     - extra-android-support
     - extra-android-m2repository
   licenses:
@@ -18,4 +18,5 @@ before_install:
 install:
   - ./gradlew
 script:
-  - ./gradlew assembleDebug --stacktrace
+  - ./gradlew :app:assembleDebug --stacktrace
+  - ./gradlew :app:test --stacktrace

CHANGELOG.md

@@ -1,6 +1,18 @@
 Change Log
 ==========
 
+Version 4.5.1 *(2017-06-28)*
+----------------------------
+- Fixed bug with folders disappearing on bookmark homepage
+- Updated history page
+- Updated bookmark page
+- Updating target to Android O
+- Updating default bookmark favicons
+- Fixed occasional bug with bookmark long press
+- Updated downloads page design
+- Enhanced keyboard shortcuts
+- Fixed bug in google search suggestions for certain languages
+
 Version 4.5.0 *(2017-06-08)*
 ----------------------------
 - Translation updates

README.md

@@ -4,13 +4,10 @@
 ![](ic_launcher_small.png)
 
 #### Download
-* [Download APK from here](https://github.com/anthonycr/Lightning-Browser/releases)
-
-* [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)
+[<img src="https://f-droid.org/badge/get-it-on.png"
+      alt="Get it on F-Droid"
+      height="80">](https://f-droid.org/app/acr.browser.lightning) [<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" 
+alt="Get it on Google Play" height="80">](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)

app/build.gradle

@@ -1,13 +1,14 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 apply plugin: 'com.getkeepsafe.dexcount'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion project.targetSdkVersion
+    buildToolsVersion project.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 25
+        minSdkVersion project.minSdkVersion
+        targetSdkVersion project.targetSdkVersion
         versionName project.versionName
         vectorDrawables.useSupportLibrary = true
     }
@@ -63,9 +64,10 @@ dexcount {
 }
 
 dependencies {
+    testCompile 'junit:junit:4.12'
 
     // support libraries
-    def supportLibVersion = '25.3.1'
+    def supportLibVersion = '25.4.0'
     compile "com.android.support:palette-v7:$supportLibVersion"
     compile "com.android.support:appcompat-v7:$supportLibVersion"
     compile "com.android.support:design:$supportLibVersion"
@@ -107,4 +109,7 @@ dependencies {
     def leakCanaryVersion = '1.5.1'
     debugCompile "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion"
     releaseCompile "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion"
+
+    // Kotlin
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }