Skip to content

WIP #2

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.

Sign up for GitHub

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
fcopardo merged 1 commit into from
Oct 30, 2015
Merged

WIP #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
bin/AndroidManifest.xml
bin/R.txt
bin/classes/.gitignore
bin/droidtext.jar
bin/jarlist.cache
libs/android-support-v4.jar
build/
*.iml
target/
*.apk
manifest-merger-release-report.txt
.gradle/

.gradle
/local.properties
/.idea/workspace.xml
.DS_Store
.idea
manifest-merger-release-report
18 changes: 17 additions & 1 deletion app/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,17 @@
/build
build/
*.iml
target/
build/
*.apk
manifest-merger-release-report.txt
.gradle/

.gradle
/local.properties
/.idea/workspace.xml
.DS_Store
*.iml
target/
.idea
build/
manifest-merger-release-report
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ project.archivesBaseName = 'droidText'

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.1.0'
compile 'com.android.support:appcompat-v7:20.0+'
}

// build a jar with source files
Expand Down
2 changes: 1 addition & 1 deletion local.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Thu Oct 29 17:30:08 CLST 2015
#Thu Oct 29 22:06:59 CLST 2015
sdk.dir=/Users/FcoPardo/android-sdk-macosx