Skip to content

Commit

Permalink
Merge commit
Browse files Browse the repository at this point in the history
  • Loading branch information
audaciouscode committed Oct 22, 2016
2 parents a684783 + e2e775d commit 8d95a2e
Show file tree
Hide file tree
Showing 35 changed files with 8,452 additions and 47 deletions.
35 changes: 35 additions & 0 deletions .travis.yml
@@ -0,0 +1,35 @@
sudo: true
language: android
jdk: oraclejdk8

before_install:
- wget http://services.gradle.org/distributions/gradle-2.14.1-bin.zip
- unzip gradle-2.14.1-bin.zip
- export GRADLE_HOME=$PWD/gradle-2.14.1
- export PATH=$GRADLE_HOME/bin:$PATH
- ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk -a --no-ui --filter tool,platform-tool,build-tools-25.0.0

script:
- gradle assembleDebug

android:
components:
- platform-tools
- tools

# The BuildTools version used by your project
- build-tools-25

# The SDK version used to compile your project
- android-25

# Additional components
- extra-google-google_play_services
- extra-google-m2repository
- extra-android-m2repository
- addon-google_apis-google-25

# Specify at least one system image,
# if you need to run emulator(s) during your tests
# - sys-img-armeabi-v7a-android-23
# - sys-img-x86-android-23
5 changes: 4 additions & 1 deletion AndroidManifest.xml
@@ -1,6 +1,9 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.audacious_software.pdk.passivedatakit">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.audacious_software.pdk.passivedatakit">
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="com.google.android.gms.permission.ACTIVITY_RECOGNITION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.READ_CALL_LOG" />
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:theme="@style/AppTheme">
<activity android:name="com.audacious_software.passive_data_kit.activities.generators.MicrosoftBandAuthActivity" android:label="@string/app_name" />
<activity android:name="com.audacious_software.passive_data_kit.activities.generators.RequestPermissionActivity" android:label="@string/app_name" />
Expand Down
1 change: 1 addition & 0 deletions assets/css/rickshaw.min.css

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

1 change: 1 addition & 0 deletions assets/js/d3.layout.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions assets/js/d3.min.js

Large diffs are not rendered by default.

0 comments on commit 8d95a2e

Please sign in to comment.