diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 412eeda..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1,22 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-# Custom for Visual Studio
-*.cs diff=csharp
-*.sln merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
-# Standard to msysgit
-*.doc diff=astextplain
-*.DOC diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot diff=astextplain
-*.DOT diff=astextplain
-*.pdf diff=astextplain
-*.PDF diff=astextplain
-*.rtf diff=astextplain
-*.RTF diff=astextplain
diff --git a/.gitignore b/.gitignore
index 5241091..4620058 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,180 +1,34 @@
# Android Studio
-.gradle
+*.jks
+.DS_Store
/local.properties
/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
/build
-# Binary
-*.apk
-
-#################
-## Eclipse
-#################
-
-*.pydevproject
-.project
-.metadata
-bin/
-tmp/
-gen/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
-proguard/
-
# External tool builders
.externalToolBuilders/
-# Locally stored "Eclipse launch configurations"
-*.launch
-
# CDT-specific
.cproject
# PDT-specific
.buildpath
-
-#################
-## Visual Studio
-#################
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-
-# Build results
-[Dd]ebug/
-[Rr]elease/
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.vspscc
-.builds
-*.dotCover
-
-## TODO: If you have NuGet Package Restore enabled, uncomment this
-#packages/
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-
-# Visual Studio profiler
-*.psess
-*.vsp
-
-# ReSharper is a .NET coding add-in
-_ReSharper*
-
-# Installshield output folder
-[Ee]xpress
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish
-
-# Others
-[Bb]in
-[Oo]bj
-sql
-TestResults
-*.Cache
-ClientBin
-stylecop.*
-~$*
-*.dbmdl
-Generated_Code #added for RIA/Silverlight projects
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-
-
-
-############
-## Windows
-############
-
# Windows image file caches
Thumbs.db
+ehthumbs.db
-# Folder config file
-Desktop.ini
-
-
-#############
-## Python
-#############
+# Local configuration file (sdk path, etc)
+local.properties
+gradle.properties
+.directory
-*.py[co]
+# Intellij project files
+*.iml
+*.ipr
+*.iws
+.idea/
-# Packages
-*.egg
-*.egg-info
-dist
+# Gradle
build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-
-#Translations
-*.mo
-
-#Mr Developer
-.mr.developer.cfg
-
-# Mac crap
-.DS_Store
-
-# Support libraries
-/external/appcompat
-/external/palette
+.gradle
\ No newline at end of file
diff --git a/app/.gitignore b/app/.gitignore
new file mode 100644
index 0000000..3f22d0d
--- /dev/null
+++ b/app/.gitignore
@@ -0,0 +1,3 @@
+/build
+app-release.apk
+manifest-merger-release-report.txt
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 6c35462..0f261e1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,20 +8,26 @@ android {
applicationId "acr.browser.lightning"
minSdkVersion 14
targetSdkVersion 22
+ versionCode 77
+ versionName "4.0.9a"
}
buildTypes {
release {
minifyEnabled true
shrinkResources true
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
+ proguardFiles 'proguard-project.txt'
}
debug {
minifyEnabled true
shrinkResources true
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
+ proguardFiles 'proguard-project.txt'
}
}
+
+ lintOptions {
+ abortOnError false
+ }
}
dependencies {
diff --git a/app/lint.xml b/app/lint.xml
deleted file mode 100644
index 0da7f20..0000000
--- a/app/lint.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/proguard-project.txt b/app/proguard-project.txt
index 2cb04a6..4bab3ea 100644
--- a/app/proguard-project.txt
+++ b/app/proguard-project.txt
@@ -72,3 +72,8 @@
-keep class * implements android.os.Parcelable {
public static final android.os.Parcelable$Creator *;
}
+
+# The support library contains references to newer platform versions.
+# Don't warn about those in case this app is linking against an older
+# platform version. We know about them, and they are safe.
+-dontwarn android.support.**
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cb63446..a8a20a3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,10 +1,7 @@
-
+ package="acr.browser.lightning" >
diff --git a/lint.xml b/lint.xml
deleted file mode 100644
index cd410d4..0000000
--- a/lint.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-