diff --git a/app/build.gradle b/app/build.gradle index b161cff..42f3e4e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,15 @@ -apply plugin: 'com.android.application' - -apply plugin: 'kotlin-android' - -apply plugin: 'kotlin-android-extensions' +plugins { + id 'com.android.application' + id 'kotlin-android' + id 'kotlin-android-extensions' +} android { - compileSdkVersion 29 + compileSdkVersion 30 defaultConfig { applicationId "com.android.puy.mvpkotlin" minSdkVersion 19 - targetSdkVersion 28 + targetSdkVersion 30 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.PageOne.runner.AndroidJUnitRunner" diff --git a/build.gradle b/build.gradle index cde15a9..3558e25 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. apply from: "conf.gradle" buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.5.30' repositories { google() mavenCentral() @@ -10,7 +10,7 @@ buildscript { maven { url 'https://repo1.maven.org/maven2/' } } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.android.tools.build:gradle:7.0.4' 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aedddd8..527ebe0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Dec 18 17:28:34 CST 2019 +#Mon Apr 11 10:56:00 CST 2022 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/puymvpjava/build.gradle b/puymvpjava/build.gradle index 9d94e30..768886f 100644 --- a/puymvpjava/build.gradle +++ b/puymvpjava/build.gradle @@ -1,7 +1,8 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' - +plugins { + id 'com.android.library' + id 'kotlin-android' + id 'kotlin-android-extensions' +} android { compileSdkVersion rootProject.ext.android.compileSdkVersion