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 9f2971a commit c5e7e52
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 25 deletions.
18 changes: 9 additions & 9 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.unpeeklivedata"
minSdk appMinSdk
targetSdk appTargetSdk
minSdkVersion appMinSdk
targetSdkVersion appTargetSdk
versionCode appVersionCode
versionName appVersionName

Expand All @@ -31,11 +31,11 @@ android {
}

dependencies {
configurations {
all {
exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx'
}
}
// configurations {
// all {
// exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx'
// }
// }

implementation fileTree(dir: 'libs', include: ['*.jar'])

Expand All @@ -50,7 +50,7 @@ dependencies {
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.recyclerview:recyclerview:1.2.1'

implementation 'androidx.navigation:navigation-runtime:2.4.2'
implementation 'androidx.navigation:navigation-runtime:2.5.0'

implementation 'com.kunminx.arch:smooth-navigation:4.0.0-beta1'
implementation 'com.kunminx.arch:strict-databinding:5.1.0-beta1'
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ apply plugin: 'io.codearte.nexus-staging'
buildscript {
ext {
appTargetSdk = 31
appMinSdk = 23
appMinSdk = 15
appVersionCode = 7060000
appVersionName = "7.6.0"
lifecycleVersion = "2.4.1"
Expand All @@ -15,11 +15,10 @@ buildscript {
repositories {
google()
mavenCentral()
maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
}

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 @@ -36,6 +35,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
2 changes: 0 additions & 2 deletions publish-mavencentral.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ task androidSourcesJar(type: Jar) {
archiveClassifier.set('sources')
if (project.plugins.findPlugin("com.android.library")) {
from android.sourceSets.main.java.srcDirs
from android.sourceSets.main.kotlin.srcDirs
} else {
from sourceSets.main.java.srcDirs
from sourceSets.main.kotlin.srcDirs
}
}

Expand Down
15 changes: 5 additions & 10 deletions unpeeklivedata/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
group='com.github.KunMinX'

ext {
PUBLISH_GROUP_ID = 'com.kunminx.arch'
Expand Down Expand Up @@ -29,30 +31,23 @@ apply from: "${rootProject.projectDir}/publish-mavencentral.gradle"


android {
compileSdk appTargetSdk
compileSdkVersion appTargetSdk
defaultConfig {
minSdk appMinSdk
targetSdk appTargetSdk
minSdkVersion appMinSdk
targetSdkVersion appTargetSdk
versionCode appVersionCode
versionName appVersionName

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
}

publishing {
singleVariant('release') {
withSourcesJar()
}
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}

}

tasks.withType(Javadoc) {
Expand Down

0 comments on commit c5e7e52

Please sign in to comment.