Merge pull request #3 from volga-volga/feat/aklimov/update-startrack

feat/aklimov/update lib

app/build.gradle

@@ -6,12 +6,12 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.0"
+    compileSdkVersion 30
+    buildToolsVersion "29.0.3"
     defaultConfig {
         applicationId "ru.vvdev.radiolibrary"
-        minSdkVersion 19
-        targetSdkVersion 29
+        minSdkVersion 21
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -44,7 +44,7 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.8'
     implementation project(":radioplayer")
-    implementation project(":startrek-player")
+    implementation project(':startrek-player')
 
     //SOCKET IO
     implementation('io.socket:socket.io-client:1.0.0') {

radioplayer/build.gradle

@@ -4,13 +4,13 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.0"
+    compileSdkVersion 30
+    buildToolsVersion "29.0.3"
 
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 
@@ -45,11 +45,13 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.8'
     implementation 'com.android.support:multidex:1.0.3'
-
-    implementation project(":startrek-player")
+    implementation project(':startrek-player')
 
 }
 repositories {
+    flatDir {
+        dirs 'libs'
+    }
     mavenCentral()
     google()
     jcenter()

radioplayer/src/main/java/com/likhanov/radioplayer/playback/Player.kt

@@ -2,9 +2,8 @@ package com.likhanov.radioplayer.playback
 
 import android.support.v4.media.session.PlaybackStateCompat
 import android.util.Log
+import com.infteh.startrekplayer.StartrekAndroid
 import com.infteh.startrekplayer.StartrekPlayer
-import com.likhanov.radioplayer.util.Store
-import java.util.*
 
 
 class Player(private var url: String = "", private val listener: RadioPlayerCallback) {
@@ -14,7 +13,7 @@ class Player(private var url: String = "", private val listener: RadioPlayerCall
     private var lastPlayedUrl = ""
 
     init {
-        System.loadLibrary("StartrekPlayerNative" + StartrekPlayer.PREFERRED_ABI)
+        System.loadLibrary("StartrekPlayerNative" + StartrekAndroid.PREFERRED_ABI)
         init()
     }
 

radioplayer/src/main/java/com/likhanov/radioplayer/radio/RadioService.kt

@@ -20,6 +20,8 @@ import android.support.v4.media.session.MediaSessionCompat
 import android.support.v4.media.session.PlaybackStateCompat
 import android.support.v7.media.MediaRouter
 import android.util.Log
+import com.infteh.startrekplayer.StartrekAndroid
+import com.infteh.startrekplayer.StartrekAndroid.getSSLCertificates
 import com.infteh.startrekplayer.StartrekNetwork
 import com.infteh.startrekplayer.StartrekPlayer
 import com.likhanov.radioplayer.model.NotificationData
@@ -33,7 +35,7 @@ open class RadioService : MediaBrowserServiceCompat(), PlaybackManager.PlaybackS
     AudioManager.OnAudioFocusChangeListener, RadioServiceListener {
 
     init {
-        System.loadLibrary("StartrekPlayerNative" + StartrekPlayer.PREFERRED_ABI)
+        System.loadLibrary("StartrekPlayerNative" + StartrekAndroid.PREFERRED_ABI)
     }
 
     private val TAG = "RadioService"
@@ -73,7 +75,7 @@ open class RadioService : MediaBrowserServiceCompat(), PlaybackManager.PlaybackS
 
     override fun init(service: MediaBrowserServiceCompat, serviceClass: Class<*>) {
         Store.init(applicationContext)
-        StartrekNetwork.setCaCertificates(StartrekNetwork.getSSLCertificates())
+        StartrekNetwork.setCaCertificates(getSSLCertificates())
         this.service = service
         this.serviceClass = serviceClass
 

settings.gradle

@@ -1,2 +1,3 @@
+include ':startrek-player'
 rootProject.name='RadioLibrary'
-include ':app', ':radioplayer', ':startrek-player'
+include ':app', ':radioplayer'

startrek-player/build.gradle

@@ -1,34 +1,2 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.0"
-
-    defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
-
-
-        consumerProguardFiles 'consumer-rules.pro'
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        debug {
-            minifyEnabled false
-            debuggable true
-            jniDebuggable true
-        }
-    }
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-}
+configurations.maybeCreate("default")
+artifacts.add("default", file('startrek-player.aar'))