-
Notifications
You must be signed in to change notification settings - Fork 27
Some cleanup #113
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
L-Henke
merged 6 commits into
SecrecySupportTeam:master
from
StelianMorariu:smo_cleanup
Mar 14, 2015
Merged
Some cleanup #113
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d92bf4c
move payment lib to payme folder
StelianMorariu 5b487f9
moved all libraries to a separate folder
StelianMorariu e7281a5
fixed billing
StelianMorariu b41a816
added .gitignore files for every app/ library and removed lines that …
StelianMorariu 40f6198
extracted sdk info from app build.gradle (it is applied from android…
StelianMorariu a585b56
reverted IabHelper to original state
StelianMorariu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| repositories { | ||
| mavenCentral() | ||
| jcenter() | ||
| } | ||
|
|
||
|
|
||
| android { | ||
| compileSdkVersion 21 | ||
| buildToolsVersion '21.1.2' | ||
|
|
||
| defaultConfig { | ||
| minSdkVersion 10 | ||
| targetSdkVersion 21 | ||
| } | ||
|
|
||
| lintOptions { | ||
| abortOnError false | ||
| } | ||
|
|
||
|
|
||
| packagingOptions { | ||
| exclude 'META-INF/DEPENDENCIES' | ||
| exclude 'META-INF/NOTICE' | ||
| exclude 'META-INF/LICENSE' | ||
| exclude 'META-INF/LICENSE.txt' | ||
| exclude 'META-INF/NOTICE.txt' | ||
| exclude 'META-INF/ASL2.0' | ||
| } | ||
| } |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| #Android Studio | ||
| .idea | ||
| *.iml | ||
| *.ipr | ||
| *.iws | ||
| classes | ||
| gen-external-apklibs | ||
|
|
||
| #Gradle | ||
| .gradle | ||
| local.properties | ||
| build | ||
|
|
||
| #Crashlytics | ||
| /src/main/res/values/com_crashlytics_export_strings.xml | ||
| /src/main/assets/crashlytics-build.properties |
This file contains hidden or 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,55 +1,44 @@ | ||
| apply plugin: 'com.android.application' | ||
| apply plugin: 'android-apt' | ||
| apply from: '../android_commons.gradle' | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| } | ||
| apt { | ||
| arguments { | ||
| androidManifestFile variant.outputs[0].processResources.manifestFile | ||
| resourcePackageName "com.doplgangr.secrecy" | ||
| } | ||
| } | ||
| android { | ||
| compileSdkVersion 21 | ||
| buildToolsVersion '21.1.2' | ||
|
|
||
| defaultConfig { | ||
| applicationId "com.doplgangr.secrecy" | ||
| minSdkVersion 10 | ||
| targetSdkVersion 21 | ||
| versionCode 53 | ||
| versionName "0.5.3" | ||
| } | ||
| buildTypes { | ||
| release { | ||
| minifyEnabled true | ||
| proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||
| } | ||
| } | ||
| lintOptions { | ||
| abortOnError false | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| compile project(':libraries:aFileChooser') | ||
| compile project(':libraries:Preferencefragment') | ||
| compile project(':libraries:payme') | ||
|
|
||
|
|
||
| compile 'commons-io:commons-io:2.4' | ||
| compile 'com.android.support:appcompat-v7:21.0.3' | ||
| compile 'com.android.support:recyclerview-v7:21.0.3' | ||
| compile 'com.android.support:support-v4:21.0.3' | ||
| compile 'com.github.chrisbanes.photoview:library:1.2.3' | ||
| compile 'com.path:android-priority-jobqueue:1.1.2' | ||
| compile 'de.greenrobot:eventbus:2.2.0' | ||
| compile project(':aFileChooser') | ||
| compile project(':Preferencefragment') | ||
| compile project(':payme:library') | ||
| compile 'com.google.protobuf:protobuf-java:2.6.0' | ||
| compile 'com.madgag.spongycastle:prov:1.51.0.0' | ||
| } | ||
|
|
||
| android { | ||
| packagingOptions { | ||
| exclude 'META-INF/LICENSE.txt' | ||
| exclude 'META-INF/NOTICE.txt' | ||
| defaultConfig { | ||
| applicationId "com.doplgangr.secrecy" | ||
| versionCode 53 | ||
| versionName "0.5.3" | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| minifyEnabled true | ||
| proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||
| } | ||
| } | ||
|
|
||
|
|
||
| } | ||
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| #Android Studio | ||
| .idea | ||
| *.iml | ||
| *.ipr | ||
| *.iws | ||
| classes | ||
| gen-external-apklibs | ||
|
|
||
| #Gradle | ||
| .gradle | ||
| local.properties | ||
| build |
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or 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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| #Android Studio | ||
| .idea | ||
| *.iml | ||
| *.ipr | ||
| *.iws | ||
| classes | ||
| gen-external-apklibs | ||
|
|
||
| #Gradle | ||
| .gradle | ||
| local.properties | ||
| build |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| apply plugin: 'com.android.library' | ||
| apply from: '../../android_commons.gradle' | ||
|
|
||
| dependencies { | ||
| compile 'com.android.support:appcompat-v7:19.0.0' | ||
| compile 'com.android.support:support-v4:19.0.0' | ||
|
|
||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| #Android Studio | ||
| .idea | ||
| *.iml | ||
| *.ipr | ||
| *.iws | ||
| classes | ||
| gen-external-apklibs | ||
|
|
||
| #Gradle | ||
| .gradle | ||
| local.properties | ||
| build |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| apply plugin: 'com.android.library' | ||
| apply from: '../../android_commons.gradle' | ||
|
|
||
|
|
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some unneeded newline in this file.