Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Gradle Version #350

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/firebase_test_lab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/[email protected]
with:
distribution: 'zulu'
java-version: '11'
java-version: '17'

- name: Make gradlew executable
run: chmod +x ./gradlew
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/[email protected]
with:
distribution: 'zulu'
java-version: '11'
java-version: '17'

- name: Make gradlew executable
run: chmod +x ./gradlew
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled_unit_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
uses: actions/[email protected]
with:
distribution: 'zulu'
java-version: '11'
java-version: '17'

- name: Make gradlew executable
run: chmod +x ./gradlew
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit_test_on_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/[email protected]
with:
distribution: 'zulu'
java-version: '11'
java-version: '17'

- name: Make gradlew executable
run: chmod +x ./gradlew
Expand Down
8 changes: 5 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -73,6 +74,7 @@ android {
buildFeatures {
viewBinding true
dataBinding true
buildConfig = true
}

packagingOptions {
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.telnyx.webrtc.sdk">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL"/>

Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/telnyx/webrtc/sdk/ui/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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 -> {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion jitpack.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
jdk:
- openjdk11
- openjdk17
14 changes: 7 additions & 7 deletions telnyx_rtc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -83,7 +83,7 @@ android {


compileSdkVersion 34

namespace "com.telnyx.webrtc.sdk.telnyx_rtc"
defaultConfig {
minSdkVersion 23
targetSdkVersion 34
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion telnyx_rtc/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.telnyx.webrtc.sdk.telnyx_rtc">
>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
<application>
Expand Down
Loading