Skip to content

Commit

Permalink
Merge pull request #61 from GetStream/agp/8.1.1
Browse files Browse the repository at this point in the history
Bump AGP, Compose, landscapist and androidx dependencies
  • Loading branch information
skydoves authored Sep 19, 2023
2 parents 84e8f06 + e213ed1 commit 03c7df4
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 53 deletions.
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/io/getstream/Configurations.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.getstream

object Configurations {
const val compileSdk = 33
const val targetSdk = 33
const val compileSdk = 34
const val targetSdk = 34
const val minSdk = 21
const val majorVersion = 1
const val minorVersion = 0
Expand Down
34 changes: 17 additions & 17 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
[versions]
streamLog = "1.1.4"
landscapist = "2.2.6"
androidGradlePlugin = "7.3.1"
androidxActivity = "1.4.0"
androidxAppCompat = "1.4.2"
androidxComposeBom = "2023.06.01"
androidxComposeCompiler = "1.4.3"
landscapist = "2.2.8"
androidGradlePlugin = "8.1.1"
androidxActivity = "1.7.2"
androidxAppCompat = "1.6.1"
androidxComposeBom = "2023.09.00"
androidxComposeCompiler = "1.5.3"
androidxComposeMaterial3 = "1.0.0-alpha13"
androidxComposeConstraintLayout = "1.0.0"
androidxComposeNavigation = "2.5.0"
androidxAnnotation = "1.5.0"
androidxCore = "1.8.0"
androidxLifecycle = "2.6.0-alpha01"
androidxComposeConstraintLayout = "1.0.1"
androidxComposeNavigation = "2.7.2"
androidxAnnotation = "1.7.0"
androidxCore = "1.12.0"
androidxLifecycle = "2.6.2"
androidxNavigation = "2.5.0"
androidxTest = "1.4.0"
androidxJunit = "1.1.3"
kotlin = "1.8.10"
androidxTest = "1.5.0"
androidxJunit = "1.5.2"
kotlin = "1.9.10"
kotlinxCoroutines = "1.7.3"
okhttp = "4.11.0"
retrofit = "2.9.0"
spotless = "6.7.0"
androidxMacroBenchmark = "1.2.0-alpha09"
androidxProfileinstaller = "1.2.2"
androidxUiAutomator = "2.3.0-alpha02"
androidxMacroBenchmark = "1.2.0-beta05"
androidxProfileinstaller = "1.3.1"
androidxUiAutomator = "2.3.0-alpha04"

[libraries]
stream-log = { group = "io.getstream", name = "stream-log-android", version.ref = "streamLog" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Aug 09 08:33:21 KST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 8 additions & 4 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,10 +80,10 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
Expand Down Expand Up @@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down
1 change: 1 addition & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
public final class io/getstream/webrtc/android/compose/BuildConfig {
public static final field BUILD_TYPE Ljava/lang/String;
public static final field DEBUG Z
public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
public fun <init> ()V
}

public final class io/getstream/webrtc/android/compose/FloatingVideoRendererKt {
public static final fun FloatingVideoRenderer-_BRzflo (Landroidx/compose/ui/Modifier;Lorg/webrtc/VideoTrack;JLandroidx/compose/foundation/layout/PaddingValues;Lorg/webrtc/EglBase$Context;Lorg/webrtc/RendererCommon$RendererEvents;Landroidx/compose/runtime/Composer;II)V
}
Expand All @@ -19,6 +12,7 @@ public final class io/getstream/webrtc/android/compose/VideoScalingType : java/l
public static final field SCALE_ASPECT_FILL Lio/getstream/webrtc/android/compose/VideoScalingType;
public static final field SCALE_ASPECT_FIT Lio/getstream/webrtc/android/compose/VideoScalingType;
public static final field SCAPE_ASPECT_FILL Lio/getstream/webrtc/android/compose/VideoScalingType;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lio/getstream/webrtc/android/compose/VideoScalingType;
public static fun values ()[Lio/getstream/webrtc/android/compose/VideoScalingType;
}
Expand Down
7 changes: 0 additions & 7 deletions stream-webrtc-android-ktx/api/stream-webrtc-android-ktx.api
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
public final class io/getstream/webrtc/android/ktx/BuildConfig {
public static final field BUILD_TYPE Ljava/lang/String;
public static final field DEBUG Z
public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
public fun <init> ()V
}

public final class io/getstream/webrtc/android/ktx/PeerConnectionExtensionsKt {
public static final fun addRtcIceCandidate (Lorg/webrtc/PeerConnection;Lorg/webrtc/IceCandidate;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
}
Expand Down
7 changes: 0 additions & 7 deletions stream-webrtc-android-ui/api/stream-webrtc-android-ui.api
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
public final class io/getstream/webrtc/android/ui/BuildConfig {
public static final field BUILD_TYPE Ljava/lang/String;
public static final field DEBUG Z
public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
public fun <init> ()V
}

public class io/getstream/webrtc/android/ui/VideoTextureViewRenderer : android/view/TextureView, android/view/TextureView$SurfaceTextureListener, org/webrtc/VideoSink {
public fun <init> (Landroid/content/Context;)V
public fun <init> (Landroid/content/Context;Landroid/util/AttributeSet;)V
Expand Down
7 changes: 0 additions & 7 deletions stream-webrtc-android/api/stream-webrtc-android.api
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@ public class org/webrtc/AudioTrack : org/webrtc/MediaStreamTrack {
public fun setVolume (D)V
}

public final class org/webrtc/BuildConfig {
public static final field BUILD_TYPE Ljava/lang/String;
public static final field DEBUG Z
public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
public fun <init> ()V
}

public class org/webrtc/BuiltinAudioDecoderFactoryFactory : org/webrtc/AudioDecoderFactoryFactory {
public fun <init> ()V
public fun createNativeAudioDecoderFactory ()J
Expand Down

0 comments on commit 03c7df4

Please sign in to comment.