From 897d800b68dcf8f766bfc2b8591989f0a25803f0 Mon Sep 17 00:00:00 2001 From: ChenRenJie Date: Wed, 24 Aug 2022 09:57:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=20kotlin-stdlib?= =?UTF-8?q?=20=E5=92=8C=20wire-runtime=20=E7=89=88=E6=9C=AC,=20=E9=81=BF?= =?UTF-8?q?=E5=85=8D=E5=AE=89=E5=85=A8=E6=BC=8F=E6=B4=9E=E9=A3=8E=E9=99=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 10 +++++----- build.gradle | 12 +++--------- library/build.gradle | 14 ++++---------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 02a9e5c9..0cd279ea 100644 --- 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 index 853ac625..cf07f23e 100644 --- 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() } } \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index 5e1afd12..6c6415e5 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,6 +1,5 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' android { @@ -8,8 +7,6 @@ android { 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' } From 662d0dc11824e35a3f3fcd247f491efce2bf5ec5 Mon Sep 17 00:00:00 2001 From: PonyCui Date: Mon, 6 Feb 2023 14:35:32 +0800 Subject: [PATCH 2/2] Update readme.md --- readme.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/readme.md b/readme.md index 5543ac9e..7c2d21dc 100644 --- a/readme.md +++ b/readme.md @@ -1,3 +1,8 @@ +# Archived +本仓库已经停止维护,你仍然继续阅读源码及创建分叉,但本仓库不会继续更新,也不会回答任何 issue。 + +This repo has stopped maintenance, you can still continue to read the source code and create forks, but this repo will not continue to be updated, nor will it answer any issues. + # SVGAPlayer [简体中文](./readme.zh.md)