Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	telnyx_rtc/src/main/java/com/telnyx/webrtc/sdk/socket/TxSocket.kt
  • Loading branch information
isaacakakpo1 committed Nov 17, 2023
2 parents 69a444e + b211648 commit f4804a5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion telnyx_rtc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ apply plugin: 'maven-publish'
apply plugin: "com.bugsnag.android.gradle"

def getVersionName = { ->
return "1.2.7"
return "1.3.0"
}

def getArtifactId = { ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ class TxSocket(

private lateinit var client: OkHttpClient
private lateinit var socket: WebSocket
private var reconnectClient:Boolean = false
/**
* Connects to the socket with the provided Host Address and Port which were used to create an instance of TxSocket
* @param listener the [TelnyxClient] used to create an instance of TxSocket that contains our
Expand Down

0 comments on commit f4804a5

Please sign in to comment.