Skip to content

Commit

Permalink
fix upload of non-opendocument files
Browse files Browse the repository at this point in the history
  • Loading branch information
TomTasche committed Dec 3, 2017
1 parent a0b863e commit 439995d
Show file tree
Hide file tree
Showing 13 changed files with 7,691 additions and 178 deletions.
5 changes: 5 additions & 0 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projects": {
"default": "admob-app-id-9025061963"
}
}
62 changes: 62 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
## Android.gitignore
# Built application files
*.apk
*.ap_
Expand Down Expand Up @@ -54,3 +55,64 @@ google-services.json
freeline.py
freeline/
freeline_project_description.json

## node.gitignore
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Typescript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,11 @@ android {
}

dependencies {
compile 'com.android.support:multidex:1.0.1'

compile (project(':payme'), {
compile(project(':payme'), {
transitive = false
})

compile 'com.google.code.gson:gson:2.8.2'

compile 'com.google.android.gms:play-services-ads:11.6.0'
compile 'com.google.android.gms:play-services-analytics:11.6.0'

compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:support-compat:25.3.1'

compile ('io.github.kobakei:ratethisapp:1.2.0') {
compile('io.github.kobakei:ratethisapp:1.2.0') {
exclude group: 'com.google.android'
exclude group: 'com.android.support'
}
Expand All @@ -53,10 +43,20 @@ dependencies {
exclude group: 'com.android.support'
}

compile 'com.android.support:recyclerview-v7:25.3.1'
compile ('com.nononsenseapps:filepicker:4.1.0', {
compile('com.nononsenseapps:filepicker:4.1.0', {
exclude group: 'com.android.support'
})

compile fileTree(dir: 'libs', include: ['*.jar'])
}

compile 'com.android.support:multidex:1.0.1'
compile 'com.google.firebase:firebase-storage:11.6.2'
compile 'com.google.code.gson:gson:2.8.2'
compile 'com.google.android.gms:play-services-ads:11.6.2'
compile 'com.google.android.gms:play-services-analytics:11.6.2'
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:support-compat:25.3.1'
compile 'com.android.support:recyclerview-v7:25.3.1'
compile 'com.google.firebase:firebase-auth:10.0.1'
}
apply plugin: 'com.google.gms.google-services'
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@
import java.io.InputStream;

import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
import android.provider.OpenableColumns;
import android.support.v4.content.AsyncTaskLoader;
import android.util.Log;

import at.stefl.commons.lwxml.writer.LWXMLStreamWriter;
import at.stefl.commons.lwxml.writer.LWXMLWriter;
import at.stefl.commons.math.vector.Vector2i;
Expand Down
Loading

0 comments on commit 439995d

Please sign in to comment.