Skip to content

Commit

Permalink
android: update native dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
saghul committed Nov 26, 2019
1 parent da98d39 commit 15e47a9
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 45 deletions.
7 changes: 3 additions & 4 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ repositories {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.appcompat:appcompat:1.1.0'

debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-beta-5'

if (!rootProject.ext.libreBuild) {
implementation 'com.google.android.gms:play-services-auth:16.0.1'
Expand All @@ -83,9 +85,6 @@ dependencies {
}

implementation project(':sdk')

debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.1'
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.1'
}

gradle.projectsEvaluated {
Expand Down
1 change: 0 additions & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:name=".MainApplication"
android:networkSecurityConfig="@xml/network_security_config"
android:theme="@style/AppTheme">
<activity
Expand Down
36 changes: 0 additions & 36 deletions android/app/src/main/java/org/jitsi/meet/MainApplication.java

This file was deleted.

4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.2'
classpath 'com.google.gms:google-services:4.2.0'
classpath 'io.fabric.tools:gradle:1.27.0'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'io.fabric.tools:gradle:1.28.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files.
Expand Down
6 changes: 4 additions & 2 deletions android/sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,12 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.fragment:fragment:1.0.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.fragment:fragment:1.1.0'

//noinspection GradleDynamicVersion
api 'com.facebook.react:react-native:+'
//noinspection GradleDynamicVersion
implementation 'org.webkit:android-jsc:+'

implementation 'com.dropbox.core:dropbox-core-sdk:3.0.8'
Expand Down

0 comments on commit 15e47a9

Please sign in to comment.