Merge branch 'develop' into core-v2

Author: DanneD-Wisemen

.github/workflows/build-on-pull-request.yml

@@ -8,8 +8,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'oracle'
           java-version: '17'

build.gradle.kts

@@ -12,12 +12,12 @@ buildscript {
 }
 
 plugins {
-    //trick: for the same plugin versions in all sub-modules
-    id("com.android.application").apply(false)
-    id("com.android.library").apply(false)
-    id("com.google.devtools.ksp").apply(false)
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.ksp) apply false
 }
 
-tasks.register("clean", Delete::class) {
+project.tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)
 }

data/networking/proxyman/src/main/java/be/appwise/proxyman/ProxyManNetworkDiscoveryManager.kt

@@ -182,7 +182,7 @@ object ProxyManNetworkDiscoveryManager {
         override fun onServiceFound(service: NsdServiceInfo) {
             // A service was found! Do something with it.
             showDebugMessage("discovery success $service")
-            val isProxymanService = if (mAllowedServices.isEmpty()) service.serviceName.contains("Proxyman-") else service.serviceName.substringAfter("Proxyman-").toLowerCase(Locale.ROOT) in mAllowedServices
+            val isProxymanService = if (mAllowedServices.isEmpty()) service.serviceName.contains("Proxyman-") else service.serviceName.substringAfter("Proxyman-").lowercase() in mAllowedServices
             when {
                 service.serviceType != SERVICE_TYPE -> // Service type is the string containing the protocol and
                     // transport layer for this service.

data/networking/src/main/java/be/appwise/networking/NetworkConstants.kt

@@ -20,7 +20,4 @@ object NetworkConstants {
 
     const val HEADER_VALUE_ACCEPT_APPLICATION_JSON = "application/json"
     const val HEADER_VALUE_PLATFORM_ANDROID = "android"
-
-    const val BAGEL_INTERCEPTOR_DEVICE_BLUETOOTH_NAME = "bluetooth_name"
-    const val BAGEL_INTERCEPTOR_DEVICE_NAME = "device_name"
 }