Bladeren bron

upgrade: gradle 7.1.3

drake 2 jaren geleden
bovenliggende
commit
66dc1f0915
4 gewijzigde bestanden met toevoegingen van 4 en 10 verwijderingen
  1. 1 2
      build.gradle
  2. 3 3
      gradle/wrapper/gradle-wrapper.properties
  3. 0 4
      net/build.gradle
  4. 0 1
      sample/build.gradle

+ 1 - 2
build.gradle

@@ -32,10 +32,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.4.32'
     }
 }

+ 3 - 3
gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Apr 07 14:55:23 PST 2021
+#Thu Jul 28 17:18:47 CST 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+zipStoreBase=GRADLE_USER_HOME

+ 0 - 4
net/build.gradle

@@ -19,9 +19,6 @@ apply plugin: "kotlin-android"
 apply plugin: "kotlin-kapt"
 apply plugin: 'org.jetbrains.dokka'
 
-apply plugin: "com.github.dcendents.android-maven"
-group = "com.github.liangjingkanji"
-
 android {
     compileSdkVersion 30
     defaultConfig {
@@ -49,7 +46,6 @@ android {
 dependencies {
     api fileTree(dir: "libs", include: ["*.jar"])
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     testImplementation "junit:junit:4.13.2"
     androidTestImplementation "androidx.test:runner:1.3.0"
     androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0"

+ 0 - 1
sample/build.gradle

@@ -69,7 +69,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "androidx.appcompat:appcompat:1.2.0"
     implementation "androidx.core:core-ktx:1.3.2"
     implementation "androidx.constraintlayout:constraintlayout:2.0.4"