Skip to content

Commit

Permalink
modify gradle version
Browse files Browse the repository at this point in the history
  • Loading branch information
KunMinX committed Jul 22, 2022
1 parent 40c92e7 commit 62f64a1
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 16 deletions.
11 changes: 8 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: "com.android.application"

android {
compileSdk appTargetSdk
compileSdkVersion appTargetSdk
defaultConfig {
applicationId "com.kunminx.puremusic"
minSdk appMinSdk
targetSdk appTargetSdk
minSdkVersion appMinSdk
targetSdkVersion appTargetSdk
versionCode appVersionCode
versionName appVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -35,6 +35,11 @@ android {
buildFeatures {
dataBinding true
}

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

dependencies {
Expand Down
13 changes: 9 additions & 4 deletions architecture/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,22 @@
apply plugin: "com.android.library"

android {
compileSdk appTargetSdk
compileSdkVersion appTargetSdk
defaultConfig {
minSdk appMinSdk
targetSdk appTargetSdk
minSdkVersion appMinSdk
targetSdkVersion appTargetSdk

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

buildFeatures {
dataBinding true
}

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


Expand All @@ -39,7 +44,7 @@ dependencies {
androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"

api "androidx.appcompat:appcompat:1.4.2"
api "androidx.navigation:navigation-runtime:$navigationVersion"
api "androidx.navigation:navigation-runtime:2.5.0"

api 'com.kunminx.arch:unpeek-livedata:7.6.0'
api 'com.kunminx.arch:smooth-navigation:4.0.0-beta1'
Expand Down
7 changes: 2 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

apply plugin: 'io.codearte.nexus-staging'

buildscript {
Expand All @@ -10,8 +8,6 @@ buildscript {
appVersionName = "3.7.0"
lifecycleVersion = "2.4.1"
navigationVersion = "2.4.2"
retrofitVersion = "2.9.0"
okHttpVersion = "4.9.3"
}

repositories {
Expand All @@ -20,7 +16,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.2.1'
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.30.0'
}
Expand All @@ -37,6 +33,7 @@ allprojects {
repositories {
google()
mavenCentral()
maven { url 'https://jitpack.io' }
}
}

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.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
12 changes: 9 additions & 3 deletions player/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/

apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
group = 'com.github.KunMinX'

ext {
PUBLISH_GROUP_ID = 'com.kunminx.player'
Expand Down Expand Up @@ -45,10 +47,10 @@ apply from: "${rootProject.projectDir}/publish-mavencentral.gradle"


android {
compileSdk appTargetSdk
compileSdkVersion appTargetSdk
defaultConfig {
minSdk appMinSdk
targetSdk appTargetSdk
minSdkVersion appMinSdk
targetSdkVersion appTargetSdk

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
Expand All @@ -66,6 +68,10 @@ android {
abortOnError false
}

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

dependencies {
Expand Down

0 comments on commit 62f64a1

Please sign in to comment.