r4sas/lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Merge branch 'dev' into dev

Browse Source
This commit is contained in:
Anthony Restaino 2017-06-03 09:06:27 -04:00 committed by GitHub
commit 375ed6946f
6 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -76,14 +76,14 @@ dependencies {
compile 'org.jsoup:jsoup:1.10.2'
// dependency injection
def daggerVersion = '2.10'
def daggerVersion = '2.11'
compile "com.google.dagger:dagger:$daggerVersion"
annotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
provided 'javax.annotation:jsr250-api:1.0'
// view binding
compile 'com.jakewharton:butterknife:8.5.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
compile 'com.jakewharton:butterknife:8.6.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.0'
// permissions
compile 'com.anthonycr.grant:permissions:1.1.2'

2
app/src/main/java/acr/browser/lightning/app/BrowserApp.java
View File

@ -17,8 +17,6 @@ import com.anthonycr.bonsai.Schedulers;
import com.squareup.leakcanary.LeakCanary;
import java.util.List;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import javax.inject.Inject;

2
app/src/main/java/acr/browser/lightning/dialog/BrowserDialog.java
View File

@ -16,7 +16,6 @@ import android.view.Window;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.TextView;
@ -26,7 +25,6 @@ import java.util.List;
import acr.browser.lightning.R;
import acr.browser.lightning.utils.DeviceUtils;
import acr.browser.lightning.utils.ResourceUtils;
import acr.browser.lightning.utils.Utils;
/**
* Copyright 7/31/2016 Anthony Restaino

1
app/src/main/java/acr/browser/lightning/utils/AdBlock.java
View File

@ -23,7 +23,6 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import acr.browser.lightning.BuildConfig;
import acr.browser.lightning.constant.Constants;
import acr.browser.lightning.preference.PreferenceManager;
@Singleton

2
app/src/main/java/acr/browser/lightning/utils/FileUtils.java
View File

@ -20,8 +20,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintStream;
import acr.browser.lightning.app.BrowserApp;
/**
* A utility class containing helpful methods
* pertaining to file storage.

1
app/src/main/java/acr/browser/lightning/utils/IntentUtils.java
View File

@ -20,7 +20,6 @@ import java.util.regex.Pattern;
import acr.browser.lightning.R;
import acr.browser.lightning.constant.Constants;
import acr.browser.lightning.controller.UIController;
public class IntentUtils {