Merge pull request svga#443 from knownitwhy/master

PonyCui · web-flow · commit 9ff63d52fa2f · 2022-08-24T10:58:05.000+08:00
fix: 更新 kotlin-stdlib 和 wire-runtime 版本, 避免安全漏洞风险
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 28
@@ -17,8 +16,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    productFlavors {
-    }
     packagingOptions {
         exclude 'META-INF/ASL2.0'
         exclude 'META-INF/LICENSE'
@@ -27,12 +24,15 @@ android {
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/MANIFEST.MF'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation project(':library')
-    implementation 'com.squareup.okhttp3:okhttp:3.4.1'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
 }
diff --git a/build.gradle b/build.gradle
@@ -1,23 +1,17 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
-    ext.kotlin_version = '1.3.50'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.0.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20"
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
         google()
+        mavenCentral()
     }
 }
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,15 +1,12 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 
 android {
     compileSdkVersion 28
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
     }
     compileOptions {
         kotlinOptions.freeCompilerArgs += ['-module-name', "com.opensource.svgaplayer"]
@@ -20,7 +17,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    productFlavors {
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     packagingOptions {
         exclude 'META-INF/ASL2.0'
@@ -34,10 +33,5 @@ android {
 
 
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.squareup.wire:wire-runtime:2.3.0-RC1'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
-repositories {
-    mavenCentral()
+    implementation 'com.squareup.wire:wire-runtime:4.4.1'
 }

Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,17 @@`
`1`		`-// Top-level build file where you can add configuration options common to all sub-projects/modules.`
`2`		`-`
`3`	`1`	`buildscript {`
`4`		`- ext.kotlin_version = '1.3.50'`
`5`	`2`	`repositories {`
`6`	`3`	`google()`
`7`		`- jcenter()`
	`4`	`+ mavenCentral()`
`8`	`5`	`}`
`9`	`6`	`dependencies {`
`10`	`7`	`classpath 'com.android.tools.build:gradle:4.0.0'`
`11`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`12`		`-`
`13`		`- // NOTE: Do not place your application dependencies here; they belong`
`14`		`- // in the individual module build.gradle files`
	`8`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20"`
`15`	`9`	`}`
`16`	`10`	`}`
`17`	`11`
`18`	`12`	`allprojects {`
`19`	`13`	`repositories {`
`20`		`- jcenter()`
`21`	`14`	`google()`
	`15`	`+ mavenCentral()`
`22`	`16`	`}`
`23`	`17`	`}`