Skip to content

Commit

Permalink
Update code to work with API 23
Browse files Browse the repository at this point in the history
  • Loading branch information
@wseemann
wseemann committed Aug 26, 2016
1 parent 828a2f0 commit 7689acc
Show file tree
Hide file tree
Showing 43 changed files with 920 additions and 720 deletions.
73 changes: 63 additions & 10 deletions app/app.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleArmDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileArmDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleArmDebugAndroidTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileArmDebugAndroidTestSources" />
<afterSyncTasks>
<task>generateArmDebugAndroidTestSources</task>
<task>generateArmDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
Expand All @@ -28,7 +25,7 @@
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/arm/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/arm/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/arm/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/arm/debug" isTestSource="false" generated="true" />
Expand All @@ -44,6 +41,15 @@
<sourceFolder url="file://$MODULE_DIR$/src/armDebug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/armDebug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/armDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/armDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testArmDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testArmDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testArmDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testArmDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testArmDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testArmDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testArmDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testArmDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/arm/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/arm/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/arm/debug" isTestSource="true" generated="true" />
Expand All @@ -57,46 +63,89 @@
<sourceFolder url="file://$MODULE_DIR$/src/arm/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/arm/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/arm/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/arm/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testArm/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testArm/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testArm/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testArm/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testArm/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testArm/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testArm/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testArm/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestArm/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestArm/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestArm/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestArm/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestArm/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestArm/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestArm/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestArm/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
Expand All @@ -105,9 +154,13 @@
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="jplaylistparser-0.2.5" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
<orderEntry type="library" exported="" name="design-23.4.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.4.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.4.0" level="project" />
<orderEntry type="library" exported="" name="animated-vector-drawable-23.4.0" level="project" />
<orderEntry type="library" exported="" name="support-vector-drawable-23.4.0" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-23.4.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.4.0" level="project" />
<orderEntry type="library" exported="" name="jsoup-1.8.1" level="project" />
<orderEntry type="module" module-name="dslv" exported="" />
<orderEntry type="library" exported="" name="effects-android-23" level="project" />
Expand Down
18 changes: 14 additions & 4 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,17 @@ android {

defaultConfig {
applicationId "net.sourceforge.servestream"
minSdkVersion 11
minSdkVersion 12
targetSdkVersion 23
versionName "0.7.1"
versionCode 106
}

lintOptions {
checkReleaseBuilds false
// Or, if you prefer, you can continue to check for errors in release builds,
// but continue the build even when errors are found:
abortOnError false
}

buildTypes {
Expand All @@ -25,7 +34,7 @@ android {
}

task buildFFmpeg(type: Exec, description: 'Compile FFmpeg source via NDK') {
def dir = file('src/main/scripts/build-ffmpeg.sh').absolutePath
def dir = file('src/main/ffmpeg/build-ffmpeg.sh').absolutePath
commandLine "$dir"
}

Expand Down Expand Up @@ -96,13 +105,13 @@ android {
}
}

Map<String, Integer> versionCodes = [armeabi: 10, 'armeabi-v7a': 11, mips: 12, x86: 13]
Map<String, Integer> versionCodes = [armeabi: 106, 'armeabi-v7a': 107, mips: 108, x86: 109]

android.applicationVariants.all { variant ->
// assign different version code for each output
variant.outputs.each { output ->
int abiVersionCode = versionCodes.get(output.getFilter(com.android.build.OutputFile.ABI)) ?: 0
output.versionCodeOverride = abiVersionCode + 6
output.versionCodeOverride = abiVersionCode + 0
// android.defaultConfig.versionCode
}
}
Expand All @@ -114,4 +123,5 @@ dependencies {
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:support-v4:23.1.1'
compile project(':dslv')
compile 'com.android.support:design:23.4.0'
}
5 changes: 1 addition & 4 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@
android:versionCode="105"
android:installLocation="auto" >

<uses-sdk
android:targetSdkVersion="23"
android:minSdkVersion="11" />

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BROADCAST_STICKY" />
Expand Down Expand Up @@ -65,6 +61,7 @@

<activity
android:name=".activity.MainActivity"
android:theme="@style/Theme.ServeStream.DarkActionBar.NoActionBar"
android:launchMode="singleTop" >

<intent-filter>
Expand Down
Loading

0 comments on commit 7689acc

Please # to comment.