diff --git a/.github/workflows/firebase_test_lab.yml b/.github/workflows/firebase_test_lab.yml index f8bc29a5..2b62c722 100644 --- a/.github/workflows/firebase_test_lab.yml +++ b/.github/workflows/firebase_test_lab.yml @@ -21,7 +21,7 @@ jobs: uses: actions/setup-java@v3.5.0 with: distribution: 'zulu' - java-version: '11' + java-version: '17' - name: Make gradlew executable run: chmod +x ./gradlew diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 604978cb..5159b766 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: uses: actions/setup-java@v3.5.0 with: distribution: 'zulu' - java-version: '11' + java-version: '17' - name: Make gradlew executable run: chmod +x ./gradlew diff --git a/.github/workflows/scheduled_unit_test.yml b/.github/workflows/scheduled_unit_test.yml index 7eaf3a51..cb7a4cf7 100644 --- a/.github/workflows/scheduled_unit_test.yml +++ b/.github/workflows/scheduled_unit_test.yml @@ -14,7 +14,7 @@ jobs: uses: actions/setup-java@v3.5.0 with: distribution: 'zulu' - java-version: '11' + java-version: '17' - name: Make gradlew executable run: chmod +x ./gradlew diff --git a/.github/workflows/unit_test_on_push.yml b/.github/workflows/unit_test_on_push.yml index eb53f316..e8c4eb1d 100644 --- a/.github/workflows/unit_test_on_push.yml +++ b/.github/workflows/unit_test_on_push.yml @@ -17,7 +17,7 @@ jobs: uses: actions/setup-java@v3.5.0 with: distribution: 'zulu' - java-version: '11' + java-version: '17' - name: Make gradlew executable run: chmod +x ./gradlew diff --git a/app/build.gradle b/app/build.gradle index 492007d7..13c4c4fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,6 +12,7 @@ localProperties.load(new FileInputStream(rootProject.file("local.properties"))) android { compileSdkVersion 34 buildToolsVersion "30.0.3" + namespace "com.telnyx.webrtc.sdk" defaultConfig { applicationId "com.telnyx.webrtc.sdk" @@ -59,11 +60,11 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = '11' + jvmTarget = '1.8' } testOptions { unitTests.includeAndroidResources = true @@ -73,6 +74,7 @@ android { buildFeatures { viewBinding true dataBinding true + buildConfig = true } packagingOptions { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2f17fecc..a13f36a6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/app/src/main/java/com/telnyx/webrtc/sdk/ui/MainActivity.kt b/app/src/main/java/com/telnyx/webrtc/sdk/ui/MainActivity.kt index 2a74a2c7..fe187fb4 100644 --- a/app/src/main/java/com/telnyx/webrtc/sdk/ui/MainActivity.kt +++ b/app/src/main/java/com/telnyx/webrtc/sdk/ui/MainActivity.kt @@ -341,6 +341,7 @@ class MainActivity : AppCompatActivity() { SocketMethod.MEDIA.methodName -> { // Ringback tone is streamed to the caller // early Media - Client Can simulate ringing state + Timber.d("Media Received") } SocketMethod.BYE.methodName -> { diff --git a/build.gradle b/build.gradle index a84245fd..e4df0101 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { maven { url 'https://plugins.gradle.org/m2/' } } dependencies { - classpath "com.android.tools.build:gradle:7.2.1" + classpath "com.android.tools.build:gradle:8.0.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath("org.jetbrains.kotlinx:kover:0.5.1") classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.21.0" diff --git a/gradle.properties b/gradle.properties index 9ead7b37..ebd7793f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,4 +20,4 @@ android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official - +android.defaults.buildfeatures.buildconfig=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2bb285c7..3b4d7d4e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Aug 02 12:25:37 IST 2022 +#Fri Jul 26 10:59:36 GMT 2024 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/jitpack.yml b/jitpack.yml index 33b17ef9..40516881 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,2 +1,2 @@ jdk: - - openjdk11 \ No newline at end of file + - openjdk17 \ No newline at end of file diff --git a/telnyx_rtc/build.gradle b/telnyx_rtc/build.gradle index 4367544f..e17910d8 100644 --- a/telnyx_rtc/build.gradle +++ b/telnyx_rtc/build.gradle @@ -14,16 +14,16 @@ apply plugin: 'maven-publish' apply plugin: "com.bugsnag.android.gradle" def getVersionName = { -> - return "1.3.5" + return "1.3.7" } def getArtifactId = { -> return "telnyx_rtc" } -task sourceJar(type: Jar) { +tasks.register('sourceJar', Jar) { from android.sourceSets.main.java.srcDirs - classifier "sources" + archiveClassifier.set('sources') } publishing { @@ -83,7 +83,7 @@ android { compileSdkVersion 34 - + namespace "com.telnyx.webrtc.sdk.telnyx_rtc" defaultConfig { minSdkVersion 23 targetSdkVersion 34 @@ -114,11 +114,11 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = '11' + jvmTarget = '1.8' } testOptions { unitTests.includeAndroidResources = true diff --git a/telnyx_rtc/src/main/AndroidManifest.xml b/telnyx_rtc/src/main/AndroidManifest.xml index 38de3778..299fcdf1 100644 --- a/telnyx_rtc/src/main/AndroidManifest.xml +++ b/telnyx_rtc/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + >