update gradle and make all classes open

pedroSG94 · Aug 11, 2021 · 2e7575c · 2e7575c
1 parent 32e2813
commit 2e7575c
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -15,8 +15,8 @@ allprojects {
   }
 }
 dependencies {
-  implementation 'com.github.pedroSG94:RTSP-Server:1.0.9'
-  implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:2.0.5'
+  implementation 'com.github.pedroSG94:RTSP-Server:1.1.0'
+  implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:2.0.6'
 }
 
 ```
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.pedro.sample"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 109
-        versionName "1.0.9"
+        versionCode 110
+        versionName "1.1.0"
     }
     buildTypes {
         release {
@@ -22,8 +22,8 @@ android {
 
 dependencies {
     implementation project(':rtspserver')
-    implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:2.0.5'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:2.0.6'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
 }
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.5.20'
+    ext.kotlin_version = '1.5.21'
     repositories {
         google()
         mavenCentral()

diff --git a/rtspserver/build.gradle b/rtspserver/build.gradle
@@ -9,8 +9,6 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 109
-        versionName "1.0.9"
     }
 
     buildTypes {
@@ -23,6 +21,6 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:2.0.5'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:2.0.6'
 }
diff --git a/rtspserver/src/main/java/com/pedro/rtspserver/RtspServer.kt b/rtspserver/src/main/java/com/pedro/rtspserver/RtspServer.kt
@@ -17,7 +17,7 @@ import java.util.*
  * TODO Use different session per client.
  */
 
-class RtspServer(private val connectCheckerRtsp: ConnectCheckerRtsp,
+open class RtspServer(private val connectCheckerRtsp: ConnectCheckerRtsp,
   val port: Int): ClientListener {
 
   private val TAG = "RtspServer"

diff --git a/rtspserver/src/main/java/com/pedro/rtspserver/RtspServerCamera1.kt b/rtspserver/src/main/java/com/pedro/rtspserver/RtspServerCamera1.kt
@@ -17,7 +17,7 @@ import java.nio.ByteBuffer
 /**
  * Created by pedro on 13/02/19.
  */
-class RtspServerCamera1 : Camera1Base {
+open class RtspServerCamera1 : Camera1Base {
 
   private val rtspServer: RtspServer
 

diff --git a/rtspserver/src/main/java/com/pedro/rtspserver/RtspServerCamera2.kt b/rtspserver/src/main/java/com/pedro/rtspserver/RtspServerCamera2.kt
@@ -13,7 +13,7 @@ import com.pedro.rtsp.utils.ConnectCheckerRtsp
 import java.nio.ByteBuffer
 
 @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-class RtspServerCamera2 : Camera2Base {
+open class RtspServerCamera2 : Camera2Base {
 
   private val rtspServer: RtspServer
 

diff --git a/rtspserver/src/main/java/com/pedro/rtspserver/RtspServerDisplay.kt b/rtspserver/src/main/java/com/pedro/rtspserver/RtspServerDisplay.kt
@@ -11,7 +11,7 @@ import com.pedro.rtsp.utils.ConnectCheckerRtsp
 import java.nio.ByteBuffer
 
 @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-class RtspServerDisplay(context: Context, useOpengl: Boolean,
+open class RtspServerDisplay(context: Context, useOpengl: Boolean,
   connectCheckerRtsp: ConnectCheckerRtsp, port: Int) : DisplayBase(context, useOpengl) {
 
   private val rtspServer: RtspServer =

diff --git a/rtspserver/src/main/java/com/pedro/rtspserver/RtspServerFromFile.kt b/rtspserver/src/main/java/com/pedro/rtspserver/RtspServerFromFile.kt
@@ -15,7 +15,7 @@ import com.pedro.rtsp.utils.ConnectCheckerRtsp
 import java.nio.ByteBuffer
 
 @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-class RtspServerFromFile : FromFileBase {
+open class RtspServerFromFile : FromFileBase {
 
   private val rtspServer: RtspServer
 

diff --git a/rtspserver/src/main/java/com/pedro/rtspserver/RtspServerOnlyAudio.kt b/rtspserver/src/main/java/com/pedro/rtspserver/RtspServerOnlyAudio.kt
@@ -8,7 +8,7 @@ import java.nio.ByteBuffer
 /**
  * Created by pedro on 17/04/21.
  */
-class RtspServerOnlyAudio(connectCheckerRtsp: ConnectCheckerRtsp, port: Int) : OnlyAudioBase() {
+open class RtspServerOnlyAudio(connectCheckerRtsp: ConnectCheckerRtsp, port: Int) : OnlyAudioBase() {
 
   private val rtspServer = RtspServer(connectCheckerRtsp, port)
 

diff --git a/rtspserver/src/main/java/com/pedro/rtspserver/ServerClient.kt b/rtspserver/src/main/java/com/pedro/rtspserver/ServerClient.kt
@@ -13,7 +13,7 @@ import java.net.Socket
 import java.net.SocketException
 import java.nio.ByteBuffer
 
-class ServerClient(private val socket: Socket, serverIp: String, serverPort: Int,
+open class ServerClient(private val socket: Socket, serverIp: String, serverPort: Int,
     connectCheckerRtsp: ConnectCheckerRtsp, sps: ByteBuffer?,
     pps: ByteBuffer?, vps: ByteBuffer?, private val sampleRate: Int,
     isStereo: Boolean, isOnlyAudio: Boolean, user: String?, password: String?,

diff --git a/rtspserver/src/main/java/com/pedro/rtspserver/ServerCommandManager.kt b/rtspserver/src/main/java/com/pedro/rtspserver/ServerCommandManager.kt
@@ -18,7 +18,7 @@ import java.util.regex.Pattern
  * Created by pedro on 23/10/19.
  *
  */
-class ServerCommandManager(private val serverIp: String, private val serverPort: Int,
+open class ServerCommandManager(private val serverIp: String, private val serverPort: Int,
                            val clientIp: String?) : CommandsManager() {
 
   private val TAG = "ServerCommandManager"