Merge pull request #20 from Novage/chore/update-dependencies-android-36

Chore: update project dependencies to latest versions

Author: mrlika

README.md

@@ -1,7 +1,7 @@
 # P2P Media Loader Mobile
 
 ![Platform: Android](https://img.shields.io/badge/platform-Android-blue) 
-[![Kotlin](https://img.shields.io/badge/kotlin-2.1.0-blue.svg?logo=kotlin)](https://kotlinlang.org) 
+[![Kotlin](https://img.shields.io/badge/kotlin-2.2.20-blue.svg?logo=kotlin)](https://kotlinlang.org) 
 [![JitPack](https://jitpack.io/v/Novage/p2p-media-loader-mobile.svg)](https://jitpack.io/#Novage/p2p-media-loader-mobile)
 [![Build Status](https://img.shields.io/github/actions/workflow/status/Novage/p2p-media-loader-mobile/check-build.yml)](https://github.com/Novage/p2p-media-loader-mobile/actions) 
 

app/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.jetbrains.kotlin.android)
@@ -6,12 +8,12 @@ plugins {
 
 android {
     namespace = "com.novage.demo"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.novage.demo"
         minSdk = 24
-        targetSdk = 35
+        targetSdk = 36
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -33,8 +35,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
-    kotlinOptions {
-        jvmTarget = "1.8"
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_1_8)
+        }
     }
 
     buildFeatures {

gradle/libs.versions.toml

@@ -1,17 +1,17 @@
 [versions]
-agp = "8.8.0"
-kotlin = "2.1.0"
-coreKtx = "1.15.0"
-kotlinxSerializationJsonVersion = "1.8.0"
-ktorServer = "3.1.0"
-lifecycleRuntimeKtx = "2.8.7"
-activityCompose = "1.10.0"
-material3 = "1.3.1"
-media3Exoplayer = "1.5.1"
-media3ExoplayerHls = "1.5.1"
-media3Ui = "1.5.1"
-okhttp = "4.12.0"
-webkit = "1.12.1"
+agp = "8.13.0"
+kotlin = "2.2.20"
+coreKtx = "1.17.0"
+kotlinxSerializationJsonVersion = "1.9.0"
+ktorServer = "3.3.1"
+lifecycleRuntimeKtx = "2.9.4"
+activityCompose = "1.11.0"
+material3 = "1.4.0"
+media3Exoplayer = "1.8.0"
+media3ExoplayerHls = "1.8.0"
+media3Ui = "1.8.0"
+okhttp = "5.2.1"
+webkit = "1.14.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Tue Sep 10 09:01:51 EEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

p2pml/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.jetbrains.kotlin.android)
@@ -8,7 +10,7 @@ plugins {
 
 android {
     namespace = "com.novage.p2pml"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 24
@@ -32,8 +34,17 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
-    kotlinOptions {
-        jvmTarget = "1.8"
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_1_8)
+        }
+    }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
+        }
     }
 }
 

p2pml/src/main/java/com/novage/p2pml/CoreEventMap.kt

@@ -13,73 +13,72 @@ sealed class CoreEventMap<T> {
      *     CoreEventMaps.OnSegmentLoaded
      * from Java code.
      */
-    @Suppress("EXPOSED_PROPERTY_TYPE")
     companion object {
         /**
          * Fired when a segment is fully downloaded and available for use.
          */
         @JvmField
-        val OnSegmentLoaded = OnSegmentLoadedEvent
+        val OnSegmentLoaded: CoreEventMap<SegmentLoadDetails> = OnSegmentLoadedEvent
 
         /**
          * Fired at the beginning of a segment download process.
          */
         @JvmField
-        val OnSegmentStart = OnSegmentStartEvent
+        val OnSegmentStart: CoreEventMap<SegmentStartDetails> = OnSegmentStartEvent
 
         /**
          * Fired when an error occurs during the download of a segment.
          */
         @JvmField
-        val OnSegmentError = OnSegmentErrorEvent
+        val OnSegmentError: CoreEventMap<SegmentErrorDetails> = OnSegmentErrorEvent
 
         /**
          * Fired if the download of a segment is aborted before completion.
          */
         @JvmField
-        val OnSegmentAbort = OnSegmentAbortEvent
+        val OnSegmentAbort: CoreEventMap<SegmentAbortDetails> = OnSegmentAbortEvent
 
         /**
          * Fired when a new peer-to-peer connection is established.
          */
         @JvmField
-        val OnPeerConnect = OnPeerConnectEvent
+        val OnPeerConnect: CoreEventMap<PeerDetails> = OnPeerConnectEvent
 
         /**
          * Fired when an existing peer-to-peer connection is closed.
          */
         @JvmField
-        val OnPeerClose = OnPeerCloseEvent
+        val OnPeerClose: CoreEventMap<PeerDetails> = OnPeerCloseEvent
 
         /**
          * Fired when an error occurs during a peer-to-peer connection.
          */
         @JvmField
-        val OnPeerError = OnPeerErrorEvent
+        val OnPeerError: CoreEventMap<PeerErrorDetails> = OnPeerErrorEvent
 
         /**
          * Fired after a chunk of data from a segment has been successfully downloaded.
          */
         @JvmField
-        val OnChunkDownloaded = OnChunkDownloadedEvent
+        val OnChunkDownloaded: CoreEventMap<ChunkDownloadedDetails> = OnChunkDownloadedEvent
 
         /**
          * Fired when a chunk of data has been successfully uploaded to a peer.
          */
         @JvmField
-        val OnChunkUploaded = OnChunkUploadedEvent
+        val OnChunkUploaded: CoreEventMap<ChunkUploadedDetails> = OnChunkUploadedEvent
 
         /**
          * Fired when an error occurs during the tracker request process.
          */
         @JvmField
-        val OnTrackerError = OnTrackerErrorEvent
+        val OnTrackerError: CoreEventMap<TrackerErrorDetails> = OnTrackerErrorEvent
 
         /**
          * Fired when a warning occurs during the tracker request process.
          */
         @JvmField
-        val OnTrackerWarning = OnTrackerWarningEvent
+        val OnTrackerWarning: CoreEventMap<TrackerWarningDetails> = OnTrackerWarningEvent
     }
 
     private data object OnSegmentLoadedEvent : CoreEventMap<SegmentLoadDetails>()