diff --git a/app/build.gradle b/app/build.gradle index 9ce4628..243421e 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 @@ -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']) @@ -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' diff --git a/build.gradle b/build.gradle index ca3ccea..1a786ac 100755 --- a/build.gradle +++ b/build.gradle @@ -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" @@ -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' } @@ -36,6 +35,7 @@ allprojects { repositories { google() mavenCentral() + maven { url "https://jitpack.io" } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ea0903d..d4b8a48 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/publish-mavencentral.gradle b/publish-mavencentral.gradle index 774fc7b..f067c63 100644 --- a/publish-mavencentral.gradle +++ b/publish-mavencentral.gradle @@ -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 } } diff --git a/unpeeklivedata/build.gradle b/unpeeklivedata/build.gradle index a3e71b0..36d5a11 100644 --- a/unpeeklivedata/build.gradle +++ b/unpeeklivedata/build.gradle @@ -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' @@ -29,10 +31,10 @@ 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 @@ -40,19 +42,12 @@ android { consumerProguardFiles "consumer-rules.pro" } - publishing { - singleVariant('release') { - withSourcesJar() - } - } - buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - } tasks.withType(Javadoc) {