Skip to content

Commit

Permalink
feat:支持java11
Browse files Browse the repository at this point in the history
  • Loading branch information
zhaobo0217 committed Dec 5, 2023
1 parent 4f7d21a commit 621126f
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 12 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
}

Expand Down
4 changes: 2 additions & 2 deletions camerax/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
}

Expand Down
24 changes: 21 additions & 3 deletions selector/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: 'com.android.library'
apply plugin: 'maven-publish'

android {
compileSdk 34
Expand All @@ -11,8 +12,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}

buildTypes {
Expand All @@ -30,7 +31,24 @@ ext {
PUBLISH_ARTIFACT_ID = "pictureselector"
}

apply from: '../publish.gradle'
afterEvaluate {
publishing {
publications {
// Creates a Maven publication called "release".
release(MavenPublication) {
// Applies the component for the release build variant.
from components.release

// You can then customize attributes of the publication as shown below.
groupId = 'com.github.xiachufang'
artifactId = 'PictureSelector'
version = '3.11.1.3'
}
}
}
}

//apply from: '../publish.gradle'

dependencies {
implementation "androidx.appcompat:appcompat:${cfgs.version_appcompat}"
Expand Down
10 changes: 5 additions & 5 deletions ucrop/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 29
compileSdk 34

defaultConfig {
minSdkVersion 19
targetSdkVersion 29
targetSdkVersion 34
vectorDrawables.useSupportLibrary = true
}
buildTypes {
Expand All @@ -15,8 +15,8 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
lintOptions {
abortOnError false
Expand All @@ -30,7 +30,7 @@ ext {
PUBLISH_ARTIFACT_ID = "ucrop"
}

apply from: '../publish.gradle'
//apply from: '../publish.gradle'

dependencies {
implementation "androidx.appcompat:appcompat:${cfgs.version_appcompat}"
Expand Down

0 comments on commit 621126f

Please sign in to comment.