-
Notifications
You must be signed in to change notification settings - Fork 796
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #299 from anthonycr/dev
Version 4.2.3 Release
- Loading branch information
Showing
261 changed files
with
59,861 additions
and
40,803 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| /build | ||
| app-release.apk | ||
| *.apk | ||
| manifest-merger-release-report.txt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,69 @@ | ||
| apply plugin: 'com.android.application' | ||
| apply plugin: 'com.neenbedankt.android-apt' | ||
|
|
||
| android { | ||
| compileSdkVersion 22 | ||
| buildToolsVersion "22.0.1" | ||
|
|
||
| compileSdkVersion 23 | ||
| buildToolsVersion "23.0.1" | ||
| defaultConfig { | ||
| applicationId "acr.browser.lightning" | ||
| minSdkVersion 14 | ||
| targetSdkVersion 22 | ||
| versionCode 78 | ||
| versionName "4.0.10a" | ||
| targetSdkVersion 23 | ||
| versionName "4.2.3a" | ||
| } | ||
| sourceSets { | ||
| lightningPlus.setRoot('src/LightningPlus') | ||
| lightningLite.setRoot('src/LightningLite') | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| minifyEnabled true | ||
| shrinkResources true | ||
| debug { | ||
| minifyEnabled false | ||
| shrinkResources false | ||
| proguardFiles 'proguard-project.txt' | ||
| } | ||
| debug { | ||
|
|
||
| release { | ||
| minifyEnabled true | ||
| shrinkResources true | ||
| proguardFiles 'proguard-project.txt' | ||
| } | ||
| } | ||
|
|
||
| productFlavors { | ||
| lightningPlus { | ||
| buildConfigField "boolean", "FULL_VERSION", "true" | ||
| applicationId "acr.browser.lightning" | ||
| versionCode 84 | ||
| } | ||
| lightningLite { | ||
| buildConfigField "boolean", "FULL_VERSION", "false" | ||
| applicationId "acr.browser.barebones" | ||
| versionCode 85 | ||
| } | ||
| } | ||
| lintOptions { | ||
| abortOnError false | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| compile(project(':libnetcipher')) { | ||
| // Exclude any support-v4 modules because appcompat-v7 will import the latest | ||
| exclude module: 'support-v4' | ||
| exclude module: 'android-support-v4' | ||
| } | ||
| compile 'com.android.support:palette-v7:22.1.1' | ||
| compile 'com.android.support:appcompat-v7:22.1.1' | ||
| compile 'org.jsoup:jsoup:1.8.1' | ||
| compile 'net.i2p.android:client:0.7@aar' | ||
| } | ||
| 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' | ||
| compile 'com.squareup:otto:1.3.8' | ||
| compile 'com.google.dagger:dagger:2.0.1' | ||
| apt 'com.google.dagger:dagger-compiler:2.0.1' | ||
| compile 'com.jakewharton:butterknife:7.0.1' | ||
|
|
||
| // Only Lightning Plus needs the proxy libraries | ||
| compile 'net.i2p.android:client:0.7' | ||
|
|
||
| // 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' | ||
|
|
||
| provided 'javax.annotation:jsr250-api:1.0' | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Oops, something went wrong.