Skip to content

Commit

Permalink
chore(WEBRTC-2141): dependency bumps (#212)
Browse files Browse the repository at this point in the history
* chore: dependency bumps

* chore: bump app compile level to 33

* chore: specify kotlin version 1.6.21

* Revert "chore: specify kotlin version 1.6.21"

This reverts commit 23716ab.

* chore: change setup/java version

* Revert "chore: change setup/java version"

This reverts commit 9845141.

* fix: onCreateOptionsMenu correct override parameter
  • Loading branch information
Oliver-Zimmerman authored Sep 19, 2022
1 parent 78907cb commit b44206f
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/firebase_test_lab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
# 1
- uses: actions/[email protected]
- name: set up JDK 1.8
uses: actions/setup-java@v3.4.1
uses: actions/setup-java@v3.5.0
with:
distribution: 'zulu'
java-version: '11'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: "📥 Check-out"
uses: actions/[email protected]
- name: set up JDK 1.8
uses: actions/setup-java@v3.4.1
uses: actions/setup-java@v3.5.0
with:
distribution: 'zulu'
java-version: '11'
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 @@ -11,7 +11,7 @@ jobs:
steps:
- uses: actions/[email protected]
- name: set up JDK 1.8
uses: actions/setup-java@v3.4.1
uses: actions/setup-java@v3.5.0
with:
distribution: 'zulu'
java-version: '11'
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 @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/[email protected]
- name: set up JDK 1.8
uses: actions/setup-java@v3.4.1
uses: actions/setup-java@v3.5.0
with:
distribution: 'zulu'
java-version: '11'
Expand Down
14 changes: 7 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ def localProperties = new Properties()
localProperties.load(new FileInputStream(rootProject.file("local.properties")))

android {
compileSdkVersion 32
compileSdkVersion 33
buildToolsVersion "30.0.3"

defaultConfig {
applicationId "com.telnyx.webrtc.sdk"
minSdkVersion 23
targetSdkVersion 32
targetSdkVersion 33
versionCode 1
versionName "1.0"

Expand Down Expand Up @@ -135,7 +135,7 @@ dependencies {

implementation deps.hilt.android
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.firebase:firebase-inappmessaging-display:20.1.2'
implementation 'com.google.firebase:firebase-inappmessaging-display:20.1.3'
kapt deps.hilt.compiler

//Testing:
Expand All @@ -146,7 +146,7 @@ dependencies {
exclude group: 'com.google.protobuf'
}
testImplementation "io.mockk:mockk:1.12.5"
testImplementation "com.squareup.okhttp3:mockwebserver:4.9.3"
testImplementation "com.squareup.okhttp3:mockwebserver:4.10.0"
testImplementation 'org.hamcrest:hamcrest-library:2.2'
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4"

Expand All @@ -162,7 +162,7 @@ dependencies {
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$jupiter_version"
testImplementation "org.junit.jupiter:junit-jupiter-params:$jupiter_version"

def kotest_version = "5.3.0"
def kotest_version = "5.4.1"
testImplementation "io.kotest:kotest-runner-junit5:$kotest_version"
testImplementation "io.kotest:kotest-assertions-core-jvm:$kotest_version"
testImplementation "io.kotest:kotest-property-jvm:$kotest_version"
Expand All @@ -185,7 +185,7 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.work:work-testing:2.7.1'
androidTestImplementation "io.mockk:mockk-android:1.12.5"
debugImplementation 'androidx.fragment:fragment-testing:1.4.1'
debugImplementation 'androidx.fragment:fragment-testing:1.5.2'
debugImplementation 'androidx.test:core-ktx:1.4.0'

androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0'
Expand All @@ -195,7 +195,7 @@ dependencies {


testImplementation "org.mockito:mockito-core:4.6.1"
androidTestImplementation "org.mockito:mockito-android:4.5.1"
androidTestImplementation "org.mockito:mockito-android:4.8.0"

androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/telnyx/webrtc/sdk/ui/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class MainActivity : AppCompatActivity() {
initViews()
}

override fun onCreateOptionsMenu(menu: Menu?): Boolean {
override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.actionbar_menu, menu)
return true
}
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
apply from: 'versions.gradle'
ext.kotlin_version = "1.6.21"
ext.kotlin_version = "1.7.10"
repositories {
google()
jcenter()
Expand All @@ -14,7 +14,7 @@ buildscript {
classpath("org.jetbrains.kotlinx:kover:0.5.1")
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.21.0"
classpath "com.bugsnag:bugsnag-android-gradle-plugin:$versions.bugsnag"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.6.21"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.10"
classpath deps.google_play_services
classpath deps.android_gradle_plugin
classpath deps.kotlin.plugin
Expand All @@ -37,7 +37,7 @@ allprojects {
}

configurations.all {
resolutionStrategy.force 'org.objenesis:objenesis:3.2'
resolutionStrategy.force 'org.objenesis:objenesis:3.3'
}
}

Expand Down
18 changes: 9 additions & 9 deletions telnyx_rtc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ dokkaHtml.configure {


android {
compileSdkVersion 32
compileSdkVersion 33
buildToolsVersion "30.0.3"

androidExtensions {
Expand All @@ -87,7 +87,7 @@ android {

defaultConfig {
minSdkVersion 23
targetSdkVersion 32
targetSdkVersion 33
versionCode 1
versionName "1.0"

Expand Down Expand Up @@ -198,10 +198,10 @@ dependencies {
implementation deps.ktor.gson
implementation deps.ktor.websockets
implementation deps.ktor.okhttp
implementation 'androidx.lifecycle:lifecycle-process:2.4.1'
implementation 'androidx.lifecycle:lifecycle-process:2.5.1'
testImplementation deps.ktor.client_test

implementation 'org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.21'
implementation 'org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.7.10'


//BugSnag:
Expand Down Expand Up @@ -232,7 +232,7 @@ dependencies {
exclude group: 'com.google.protobuf'
}
testImplementation "io.mockk:mockk:1.12.5"
testImplementation "com.squareup.okhttp3:mockwebserver:4.9.3"
testImplementation "com.squareup.okhttp3:mockwebserver:4.10.0"
testImplementation 'org.hamcrest:hamcrest-library:2.2'

// jUnit 4
Expand All @@ -246,7 +246,7 @@ dependencies {
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$jupiter_version"
testImplementation "org.junit.jupiter:junit-jupiter-params:$jupiter_version"

def kotest_version = "5.3.0"
def kotest_version = "5.4.1"
testImplementation "io.kotest:kotest-runner-junit5:$kotest_version"
testImplementation "io.kotest:kotest-assertions-core-jvm:$kotest_version"
testImplementation "io.kotest:kotest-property-jvm:$kotest_version"
Expand All @@ -267,11 +267,11 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.work:work-testing:2.7.1'
androidTestImplementation "io.mockk:mockk-android:1.12.5"
debugImplementation 'androidx.fragment:fragment-testing:1.4.1'
debugImplementation 'androidx.fragment:fragment-testing:1.5.2'
debugImplementation 'androidx.test:core-ktx:1.4.0'

testImplementation "org.mockito:mockito-inline:4.5.1"
androidTestImplementation "org.mockito:mockito-android:4.5.1"
testImplementation "org.mockito:mockito-inline:4.8.0"
androidTestImplementation "org.mockito:mockito-android:4.8.0"

androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
Expand Down
2 changes: 1 addition & 1 deletion versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ versions.dexter = "6.2.2"
versions.googleservices = "4.3.8"
versions.volley = "1.1.1"
versions.firebasebom = "28.2.1"
versions.hilt = "2.38.1"
versions.hilt = "2.43.2"
versions.bugsnag = "7.+"
versions.dialpad = "3.0.0"

Expand Down

0 comments on commit b44206f

Please sign in to comment.