Merge branch 'develop' into develop

This commit is contained in:
Johannes Pohl 2018-02-02 21:53:55 +01:00 committed by GitHub
commit f1547f3e99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 9 deletions

View file

@ -109,6 +109,8 @@ There is also an [unofficial FHEM module](https://forum.fhem.de/index.php/topic,
There is a [snapcast component for Home Assistant](https://home-assistant.io/components/media_player.snapcast/) which integrates a snapcast controller in to the [Home Assistant](https://home-assistant.io/) home automation system.
For a webinterface in python, see [snapcastr](https://github.com/xkonni/snapcastr), based on [python-snapcast](https://github.com/happyleavesaoc/python-snapcast). This interface controls client volume and assigns streams to groups.
Setup of audio players/server
-----------------------------
Snapcast can be used with a number of different audio players and servers, and so it can be integrated into your favorite audio-player solution and make it synced-multiroom capable.

View file

@ -1,13 +1,13 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 26
buildToolsVersion '26.0.2'
compileSdkVersion 27
buildToolsVersion '27.0.3'
defaultConfig {
applicationId "de.badaix.snapcast"
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 27
versionCode 1200
versionName "0.12.0"
multiDexEnabled true
@ -27,9 +27,9 @@ android {
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:cardview-v7:26.1.0'
compile 'com.android.support:support-v4:26.1.0'
compile 'com.android.support:appcompat-v7:27.0.2'
compile 'com.android.support:cardview-v7:27.0.2'
compile 'com.android.support:support-v4:27.0.2'
// compile 'com.android.support:recyclerview-v7:23.1.1'
compile 'com.android.support:design:26.1.0'
compile 'com.android.support:design:27.0.2'
}

View file

@ -9,7 +9,7 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.android.tools.build:gradle:3.0.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

View file

@ -1,7 +1,7 @@
#/bin/sh
export NDK_DIR_ARM="$1-arm"
export NDK_DIR_MIPS="$1-mips"
#export NDK_DIR_MIPS="$1-mips"
export NDK_DIR_X86="$1-x86"
./build_android.sh