migrate to kotlin dsl and remove open if not needed

README.md

@@ -15,8 +15,8 @@ allprojects {
   }
 }
 dependencies {
-  implementation 'com.github.pedroSG94:RTSP-Server:1.2.0'
-  implementation 'com.github.pedroSG94.RootEncoder:library:2.3.3'
+  implementation 'com.github.pedroSG94:RTSP-Server:1.2.1'
+  implementation 'com.github.pedroSG94.RootEncoder:library:2.3.5'
 }
 
 ```

app/build.gradle.kts

@@ -0,0 +1,42 @@
+val vCode: Int by rootProject.extra
+val vName: String by rootProject.extra
+val rootEncoderVersion: String by rootProject.extra
+
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    namespace = "com.pedro.sample"
+    compileSdk = 34
+
+    defaultConfig {
+        applicationId = "com.pedro.sample"
+        minSdk = 16
+        targetSdk = 34
+        versionCode = vCode
+        versionName = vName
+    }
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
+dependencies {
+    implementation(project(":rtspserver"))
+    implementation("com.github.pedroSG94.RootEncoder:library:$rootEncoderVersion")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+}

app/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

build.gradle.kts

@@ -0,0 +1,20 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+val libraryGroup by rootProject.extra { "com.github.pedroSG94" }
+val vCode by rootProject.extra { 121 }
+val vName by rootProject.extra { "1.2.1" }
+val coroutinesVersion by rootProject.extra { "1.7.3" }
+val rootEncoderVersion by rootProject.extra { "2.3.5" }
+
+plugins {
+    id("com.android.application") version "8.2.2" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.22" apply false
+    id("org.jetbrains.dokka") version "1.9.10" apply true
+}
+
+tasks.register("clean") {
+    delete(rootProject.buildDir)
+}
+
+tasks.dokkaHtmlMultiModule.configure {
+    outputDirectory.set(File("docs"))
+}

rtspserver/build.gradle.kts

@@ -0,0 +1,61 @@
+val libraryGroup: String by rootProject.extra
+val vName: String by rootProject.extra
+val coroutinesVersion: String by rootProject.extra
+val rootEncoderVersion: String by rootProject.extra
+
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+    id("maven-publish")
+    id("org.jetbrains.dokka")
+}
+
+android {
+    namespace = "com.pedro.rtspserver"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 16
+        lint.targetSdk = 34
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+
+    publishing {
+        singleVariant("release")
+    }
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            // Creates a Maven publication called "release".
+            create<MavenPublication>("release") {
+                // Applies the component for the release build variant.
+                from(components["release"])
+
+                // You can then customize attributes of the publication as shown below.
+                groupId = libraryGroup
+                artifactId = "rtspserver"
+                version = vName
+            }
+        }
+    }
+}
+
+dependencies {
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")
+    implementation("com.github.pedroSG94.RootEncoder:library:$rootEncoderVersion")
+}

rtspserver/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

rtspserver/src/main/java/com/pedro/rtspserver/RtspServer.kt

@@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit
  * TODO Use different session per client.
  */
 
-open class RtspServer(
+class RtspServer(
   private val connectChecker: ConnectChecker,
   val port: Int
 ): ServerListener {

rtspserver/src/main/java/com/pedro/rtspserver/RtspServerCamera1.kt

@@ -18,7 +18,7 @@ import java.nio.ByteBuffer
 /**
  * Created by pedro on 13/02/19.
  */
-open class RtspServerCamera1: Camera1Base {
+class RtspServerCamera1: Camera1Base {
 
   private val rtspServer: RtspServer
 

rtspserver/src/main/java/com/pedro/rtspserver/RtspServerCamera2.kt

@@ -14,7 +14,7 @@ import com.pedro.rtspserver.util.RtspServerStreamClient
 import java.nio.ByteBuffer
 
 @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-open class RtspServerCamera2: Camera2Base {
+class RtspServerCamera2: Camera2Base {
 
   private val rtspServer: RtspServer
 

rtspserver/src/main/java/com/pedro/rtspserver/RtspServerDisplay.kt

@@ -12,7 +12,7 @@ import com.pedro.rtspserver.util.RtspServerStreamClient
 import java.nio.ByteBuffer
 
 @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-open class RtspServerDisplay(
+class RtspServerDisplay(
   context: Context, useOpengl: Boolean,
   connectChecker: ConnectChecker, port: Int
 ): DisplayBase(context, useOpengl) {

rtspserver/src/main/java/com/pedro/rtspserver/RtspServerFromFile.kt

@@ -16,7 +16,7 @@ import com.pedro.rtspserver.util.RtspServerStreamClient
 import java.nio.ByteBuffer
 
 @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-open class RtspServerFromFile: FromFileBase {
+class RtspServerFromFile: FromFileBase {
 
   private val rtspServer: RtspServer
 

rtspserver/src/main/java/com/pedro/rtspserver/RtspServerOnlyAudio.kt

@@ -10,7 +10,7 @@ import java.nio.ByteBuffer
 /**
  * Created by pedro on 17/04/21.
  */
-open class RtspServerOnlyAudio(
+class RtspServerOnlyAudio(
   connectChecker: ConnectChecker, port: Int
 ): OnlyAudioBase() {
 

rtspserver/src/main/java/com/pedro/rtspserver/ServerClient.kt

@@ -19,7 +19,7 @@ import java.net.Socket
 import java.net.SocketException
 import java.nio.ByteBuffer
 
-open class ServerClient(
+class ServerClient(
   private val socket: Socket, serverIp: String, serverPort: Int,
   private val connectChecker: ConnectChecker,
   val clientAddress: String,

rtspserver/src/main/java/com/pedro/rtspserver/ServerCommandManager.kt

@@ -19,7 +19,7 @@ import java.util.regex.Pattern
  * Created by pedro on 23/10/19.
  *
  */
-open class ServerCommandManager: CommandsManager() {
+class ServerCommandManager: CommandsManager() {
 
   private var serverIp: String = ""
   private var serverPort: Int = 0

settings.gradle.kts

@@ -0,0 +1,20 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+@Suppress("UnstableApiUsage")
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        maven { url = uri("https://jitpack.io") }
+    }
+}
+
+rootProject.name = "RTSP-Server"
+include(":app", ":rtspserver")