Skip to content

Commit

Permalink
1.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
LoveBabyForeve committed Sep 14, 2021
1 parent c0d9a3d commit 54f858b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 21 deletions.
16 changes: 2 additions & 14 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,8 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = "11"
useIR = true
}
buildFeatures {
compose true
}
}
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(11))
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

Expand Down
8 changes: 5 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ buildscript {
}
}
dependencies {
classpath "com.android.tools.build:gradle:7.0.1"
classpath "com.android.tools.build:gradle:4.1.3"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// https://developer.android.google.cn/studio/releases/gradle-plugin#updating-plugin
classpath "digital.wup:android-maven-publish:3.6.3"
// classpath "digital.wup:android-maven-publish:3.6.3"
//1.自动化maven打包插件
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
6 changes: 3 additions & 3 deletions xiayuCommon/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'com.android.library'
id "digital.wup.android-maven-publish"
id 'com.github.dcendents.android-maven'
}

def siteUrl = 'https://github.com/LoveBabyForeve/xiayucommon' //项目在github主页地址
Expand Down Expand Up @@ -35,8 +35,8 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

Expand Down

0 comments on commit 54f858b

Please sign in to comment.