Skip to content

Commit

Permalink
Merge pull request #50 from videosdk-live/update/version
Browse files Browse the repository at this point in the history
update versions
  • Loading branch information
ishabodiwala authored Mar 12, 2024
2 parents b6440c6 + ec46754 commit c895f0a
Show file tree
Hide file tree
Showing 22 changed files with 19 additions and 12 deletions.
19 changes: 10 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ def localProperties = new Properties()
localProperties.load(new FileInputStream(rootProject.file("local.properties")))

android {
compileSdkVersion 33
compileSdkVersion 34

defaultConfig {
applicationId "live.videosdk.rtc.android.java"
minSdkVersion 21
targetSdkVersion 33
//noinspection EditedTargetSdkVersion
targetSdkVersion 34
versionCode 2
versionName "1.1"
multiDexEnabled true
Expand All @@ -31,7 +32,7 @@ android {
}

release {
minifyEnabled false
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'

buildConfigField("String", "AUTH_TOKEN", "\"" + localProperties['auth_token'] + "\"")
Expand All @@ -47,13 +48,13 @@ android {

dependencies {

implementation 'live.videosdk:rtc-android-sdk:0.1.21'
implementation 'live.videosdk:rtc-android-sdk:0.1.26'
implementation 'com.nabinbhandari.android:permissions:3.8'
implementation 'com.amitshekhar.android:android-networking:1.0.2'

implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.11.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.22'
implementation "com.airbnb.android:lottie:5.2.0"
Expand All @@ -62,8 +63,8 @@ dependencies {
implementation 'com.android.support:multidex:2.0.1'

testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

// Import the Firebase BoM
implementation platform('com.google.firebase:firebase-bom:30.2.0')
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="live.videosdk.rtc.android.java">

<uses-feature
android:name="android.hardware.camera"
android:required="false" />

<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ protected void onCreate(Bundle savedInstanceState) {
// create a new meeting instance
meeting = VideoSDK.initMeeting(
GroupCallActivity.this, meetingId, localParticipantName,
micEnabled, webcamEnabled, null, null, true, customTracks
micEnabled, webcamEnabled, null, null, true, customTracks,null
);

//
Expand Down Expand Up @@ -1073,6 +1073,7 @@ private void toggleRecording() {

@Override
public void onBackPressed() {
super.onBackPressed();
showLeaveOrEndDialog();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@ protected void onCreate(Bundle savedInstanceState) {

// create a new meeting instance
meeting = VideoSDK.initMeeting(
OneToOneCallActivity.this, meetingId, localParticipantName,
false, false, null, null, true, customTracks
OneToOneCallActivity.this, meetingId, localParticipantName,micEnabled,
webcamEnabled, null, null, false, customTracks,null
);

meeting.addEventListener(meetingEventListener);
Expand Down Expand Up @@ -1139,6 +1139,7 @@ private void toggleRecording() {

@Override
public void onBackPressed() {
super.onBackPressed();
showLeaveOrEndDialog();
}

Expand Down

0 comments on commit c895f0a

Please sign in to comment.