From 21b3ff5ddc4a91edb67350ad5ab6441acb1edcd6 Mon Sep 17 00:00:00 2001 From: Lonely dreamers <1240413544@qq.com> Date: Mon, 25 Apr 2022 22:47:27 +0800 Subject: [PATCH] Feature: update build.gradle --- AndroidMedia/build.gradle | 5 +---- Live/build.gradle | 3 --- app/build.gradle | 1 - build.gradle | 16 +++++----------- gradle/wrapper/gradle-wrapper.properties | 6 +++--- libmp3/build.gradle | 3 --- 6 files changed, 9 insertions(+), 25 deletions(-) diff --git a/AndroidMedia/build.gradle b/AndroidMedia/build.gradle index 181e8fa..0c94c99 100644 --- a/AndroidMedia/build.gradle +++ b/AndroidMedia/build.gradle @@ -6,14 +6,11 @@ apply plugin: 'kotlin-android' android { compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode rootProject.ext.versionCode - versionName rootProject.ext.versionName -// applicationId "com.frank.androidmedia" + // applicationId "com.frank.androidmedia" } buildTypes { diff --git a/Live/build.gradle b/Live/build.gradle index 88c37b5..ae0c4cb 100644 --- a/Live/build.gradle +++ b/Live/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { // applicationId "com.frank.live" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode rootProject.ext.versionCode - versionName rootProject.ext.versionName externalNativeBuild { cmake { cppFlags "" diff --git a/app/build.gradle b/app/build.gradle index a0dde26..51cd81d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,6 @@ apply plugin: 'kotlin-android' android { compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { applicationId "com.frank.ffmpeg" minSdkVersion rootProject.ext.minSdkVersion diff --git a/build.gradle b/build.gradle index 95a33c3..dcf1b31 100644 --- a/build.gradle +++ b/build.gradle @@ -3,14 +3,11 @@ buildscript { ext.kotlin_version = '1.3.50' repositories { - jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } + google() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:7.1.3' 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 @@ -19,11 +16,8 @@ buildscript { allprojects { repositories { - jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } + google() + mavenCentral() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ea82e13..5cf2ba3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Mar 05 23:59:00 CST 2019 +#Mon Apr 25 22:26:20 CST 2022 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/libmp3/build.gradle b/libmp3/build.gradle index 50d4d9c..899a35c 100644 --- a/libmp3/build.gradle +++ b/libmp3/build.gradle @@ -3,14 +3,11 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode rootProject.ext.versionCode - versionName rootProject.ext.versionName externalNativeBuild { cmake {