Merge pull request #11 from AgoraIO-Community/license-fix

Fix security issue with GPL License
AgoraIO-Community · May 28, 2021 · db85abf · db85abf
2 parents 456a048 + ae57096
commit db85abf
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/agorauikit_android/build.gradle.kts b/agorauikit_android/build.gradle.kts
@@ -1,5 +1,4 @@
 plugins {
-    id("com.github.dcendents.android-maven")
     id("com.android.library")
     id("kotlin-android")
     id("org.jetbrains.dokka") version "1.4.32"
@@ -37,12 +36,12 @@ android {
 dependencies {
     val kotlinVersion = "1.5.0"
     implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
-    implementation("androidx.core:core-ktx:1.3.2")
-    implementation("androidx.appcompat:appcompat:1.2.0")
+    implementation("androidx.core:core-ktx:1.5.0")
+    implementation("androidx.appcompat:appcompat:1.3.0")
     implementation("com.google.android.material:material:1.3.0")
-    api("io.agora.rtc:full-sdk:3.3.2")
+    api("com.github.agorabuilder:native-full-sdk:3.4.2")
     implementation("com.squareup.okhttp3:okhttp:3.14.6")
-    testImplementation("junit:junit:4.+")
+    testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.2")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0")
     dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.4.32")

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -35,8 +35,8 @@ android {
 dependencies {
     val kotlinVersion = "1.5.0"
     implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
-    implementation("androidx.core:core-ktx:1.3.2")
-    implementation("androidx.appcompat:appcompat:1.2.0")
+    implementation("androidx.core:core-ktx:1.5.0")
+    implementation("androidx.appcompat:appcompat:1.3.0")
     implementation("com.google.android.material:material:1.3.0")
     implementation("androidx.constraintlayout:constraintlayout:2.0.4")
 
@@ -45,6 +45,5 @@ dependencies {
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.2")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0")
-
 //    implementation 'io.agora.uikit:agorauikit:2.0.1'
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,6 @@ buildscript {
     dependencies {
         classpath("com.android.tools.build:gradle:4.1.3")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-        classpath("com.github.dcendents:android-maven-gradle-plugin:2.1")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -20,6 +19,7 @@ allprojects {
         google()
         jcenter()
         mavenCentral()
+        maven { setUrl("https://jitpack.io") }
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip