- Stability improvements / bugfixes

veeplay · Jun 24, 2015 · 24a72e1 · 24a72e1
1 parent 31f31c1
commit 24a72e1
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 56 deletions.
diff --git a/AppscendVastPlayer/AndroidManifest.xml b/AppscendVastPlayer/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.appscend.vastplayer"
-    android:versionCode="2000"
-    android:versionName="2.0.0"
+    android:versionCode="205"
+    android:versionName="2.0.5"
     android:installLocation="auto">
     <uses-sdk android:minSdkVersion="13"/>
     <application></application>

diff --git a/AppscendVastPlayer/bin/AndroidManifest.xml b/AppscendVastPlayer/bin/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.appscend.vastplayer"
-    android:versionCode="2000"
-    android:versionName="2.0.0"
+    android:versionCode="205"
+    android:versionName="2.0.5"
     android:installLocation="auto">
     <uses-sdk android:minSdkVersion="13"/>
     <application></application>

diff --git a/AppscendVastPlayer/bin/appscendvastplayer.jar b/AppscendVastPlayer/bin/appscendvastplayer.jar
diff --git a/AppscendVastPlayer/build.gradle b/AppscendVastPlayer/build.gradle
@@ -2,8 +2,9 @@ apply plugin: 'com.android.library'
 apply plugin: 'maven'
 apply plugin: 'signing'
 
-version '2.0.0'
+version '2.0.5'
 group = "com.veeplay"
+project.ext.artifactId = "veeplay-player-android"
 project.ext.projectName = "Veeplay SDK"
 project.ext.projectDescription= "Veeplay for Android SDK"
 project.ext.projectUrl = "http://veeplay.com"
@@ -23,36 +24,6 @@ android {
             assets.srcDirs = ['assets']
         }
 
-        general {
-            manifest.srcFile 'AndroidManifest-general.xml'
-            java.srcDirs = ['src-general']
-            resources.srcDirs = ['src-general']
-            aidl.srcDirs = ['src-general']
-            renderscript.srcDirs = ['src-general']
-            res.srcDirs = ['res-general']
-            assets.srcDirs = ['assets-general']
-        }
-
-        aes128 {
-            manifest.srcFile 'AndroidManifest-aes128.xml'
-            java.srcDirs = ['src-aes128']
-            resources.srcDirs = ['src-aes128']
-            aidl.srcDirs = ['src-aes128']
-            renderscript.srcDirs = ['src-aes128']
-            res.srcDirs = ['res-aes128']
-            assets.srcDirs = ['assets-aes128']
-        }
-
-        noExo {
-            manifest.srcFile 'AndroidManifest-noExo.xml'
-            java.srcDirs = ['src-noExo']
-            resources.srcDirs = ['src-noExo']
-            aidl.srcDirs = ['src-noExo']
-            renderscript.srcDirs = ['src-noExo']
-            res.srcDirs = ['res-noExo']
-            assets.srcDirs = ['assets-noExo']
-        }
-
         // Move the tests to tests/java, tests/res, etc...
         instrumentTest.setRoot('tests')
 
@@ -66,24 +37,6 @@ android {
         release.setRoot('build-types/release')
     }
 
-    defaultPublishConfig "generalDebug"
-    publishNonDefault false
-
-    productFlavors {
-        //noinspection GroovyMissingReturnStatement
-        general {
-
-        }
-        //noinspection GroovyMissingReturnStatement
-        aes128 {
-
-        }
-        //noinspection GroovyMissingReturnStatement
-        noExo {
-
-        }
-    }
-
     buildTypes {
         release {
             minifyEnabled true
@@ -100,13 +53,12 @@ dependencies {
     compile files('libs/YouTubeAndroidPlayerApi.jar')
     compile files('libs/cloning-1.9.0.jar')
     compile files('libs/jdom-2.0.5.jar')
-    compile 'com.android.support:support-v4:22.1.1'
+    compile 'com.android.support:support-v4:20.0.0'
     compile 'com.google.code.gson:gson:2.3'
     compile 'com.squareup.okhttp:okhttp:2.1.0'
     compile 'com.squareup.okhttp:okhttp-urlconnection:2.1.0'
     compile 'com.squareup.okio:okio:1.0.0'
-    aes128Compile files('libs/exoplayer-multitrack.jar')
-    generalCompile files('libs/exoplayer-general.jar')
+    compile files('libs/exoplayer-general.jar')
 }
 
 apply from: "..\\upload_archives_task.gradle"
diff --git a/AppscendVastPlayer/libs/appscendvastplayer.jar b/AppscendVastPlayer/libs/appscendvastplayer.jar
diff --git a/AppscendVastPlayer/libs/exoplayer-general.jar b/AppscendVastPlayer/libs/exoplayer-general.jar
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+2.0.5
+=====
+- Stability improvements / bugfixes
+
 2.0.0
 =====
 - added support for the Google Cast plugin