From 75ea0b2ade2e772f52ed17b7f9f799c50ba01aa9 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 19 Jun 2021 21:43:35 -0700 Subject: Yet another version update --- artifacts.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'artifacts.gradle') diff --git a/artifacts.gradle b/artifacts.gradle index 4471d37..132ce47 100644 --- a/artifacts.gradle +++ b/artifacts.gradle @@ -1,6 +1,6 @@ import groovy.xml.MarkupBuilder -apply plugin: 'com.github.dcendents.android-maven' +apply plugin: 'maven-publish' // build a jar with source files task sourcesJar(type: Jar) { @@ -12,7 +12,7 @@ task javadoc(type: Javadoc) { failOnError false source = android.sourceSets.main.java.sourceFiles classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - classpath += configurations.compile + classpath += configurations.implementation } // build a jar with javadoc -- cgit v1.2.3 From 86e692cdb1c872259503acab642c75e1e519a537 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 29 Aug 2021 15:16:57 -0700 Subject: Update artifacts --- artifacts.gradle | 58 ++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 23 deletions(-) (limited to 'artifacts.gradle') diff --git a/artifacts.gradle b/artifacts.gradle index 132ce47..a96e81a 100644 --- a/artifacts.gradle +++ b/artifacts.gradle @@ -2,29 +2,29 @@ import groovy.xml.MarkupBuilder apply plugin: 'maven-publish' -// build a jar with source files -task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' -} - -task javadoc(type: Javadoc) { - failOnError false - source = android.sourceSets.main.java.sourceFiles - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - classpath += configurations.implementation -} - -// build a jar with javadoc -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourcesJar - archives javadocJar -} +//// build a jar with source files +//task sourcesJar(type: Jar) { +// from android.sourceSets.main.java.srcDirs +// classifier = 'sources' +//} +// +//task javadoc(type: Javadoc) { +// failOnError false +// source = android.sourceSets.main.java.sourceFiles +// classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) +// classpath += configurations.implementation +//} +// +//// build a jar with javadoc +//task javadocJar(type: Jar, dependsOn: javadoc) { +// classifier = 'javadoc' +// from javadoc.destinationDir +//} + +//artifacts { +// archives sourcesJar +// archives javadocJar +//} // Task to generate our public.xml file // See https://developer.android.com/studio/projects/android-library.html#PrivateResources @@ -107,4 +107,16 @@ task generatepublicxml { } } +afterEvaluate { + publishing { + publications { + release(MavenPublication) { + from components.release + groupId = group + artifactId = project.name + } + } + } +} + build.dependsOn generatepublicxml \ No newline at end of file -- cgit v1.2.3 From c283a41a0a4e07d26986d28216281f0ffc622f5e Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 29 Aug 2021 18:08:39 -0700 Subject: Cleanup and update versions --- artifacts.gradle | 24 ------------------------ buildSrc/src/main/kotlin/kau/Plugins.kt | 1 - buildSrc/src/main/kotlin/kau/Versions.kt | 9 +++------ 3 files changed, 3 insertions(+), 31 deletions(-) (limited to 'artifacts.gradle') diff --git a/artifacts.gradle b/artifacts.gradle index a96e81a..8e01978 100644 --- a/artifacts.gradle +++ b/artifacts.gradle @@ -2,30 +2,6 @@ import groovy.xml.MarkupBuilder apply plugin: 'maven-publish' -//// build a jar with source files -//task sourcesJar(type: Jar) { -// from android.sourceSets.main.java.srcDirs -// classifier = 'sources' -//} -// -//task javadoc(type: Javadoc) { -// failOnError false -// source = android.sourceSets.main.java.sourceFiles -// classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) -// classpath += configurations.implementation -//} -// -//// build a jar with javadoc -//task javadocJar(type: Jar, dependsOn: javadoc) { -// classifier = 'javadoc' -// from javadoc.destinationDir -//} - -//artifacts { -// archives sourcesJar -// archives javadocJar -//} - // Task to generate our public.xml file // See https://developer.android.com/studio/projects/android-library.html#PrivateResources // We assume resources within res-public are public diff --git a/buildSrc/src/main/kotlin/kau/Plugins.kt b/buildSrc/src/main/kotlin/kau/Plugins.kt index 67d14c9..d255ad4 100644 --- a/buildSrc/src/main/kotlin/kau/Plugins.kt +++ b/buildSrc/src/main/kotlin/kau/Plugins.kt @@ -8,7 +8,6 @@ object Plugins { const val aboutLibraries = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${Versions.aboutLibraries}" const val bugsnag = "com.bugsnag:bugsnag-android-gradle-plugin:${Versions.bugsnagPlugin}" const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}" - const val androidMaven = "com.github.dcendents:android-maven-gradle-plugin:${Versions.mavenPlugin}" const val playPublisher = "com.github.triplet.gradle:play-publisher:${Versions.playPublishPlugin}" const val dexCount = "com.getkeepsafe.dexcount:dexcount-gradle-plugin:${Versions.dexCountPlugin}" const val gitVersion = "com.gladed.androidgitversion:gradle-android-git-version:${Versions.gitVersionPlugin}" diff --git a/buildSrc/src/main/kotlin/kau/Versions.kt b/buildSrc/src/main/kotlin/kau/Versions.kt index b92338c..cb7fb44 100644 --- a/buildSrc/src/main/kotlin/kau/Versions.kt +++ b/buildSrc/src/main/kotlin/kau/Versions.kt @@ -25,13 +25,13 @@ object Versions { const val cardView = "1.0.0" // https://mvnrepository.com/artifact/androidx.constraintlayout/constraintlayout - const val constraintLayout = "2.1.0-beta02" + const val constraintLayout = "2.1.0" // https://mvnrepository.com/artifact/androidx.core/core-ktx - const val coreKtx = "1.6.0-rc01" + const val coreKtx = "1.6.0" // https://kotlinlang.org/docs/reference/using-gradle.html - const val kotlin = "1.5.10" + const val kotlin = "1.5.30" // https://github.com/Kotlin/kotlinx.coroutines/releases const val coroutines = "1.5.0" @@ -95,9 +95,6 @@ object Versions { // https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google const val gradlePlugin = "7.1.0-alpha02" - // https://github.com/dcendents/android-maven-gradle-plugin/releases - const val mavenPlugin = "2.1" - // https://github.com/Triple-T/gradle-play-publisher/releases const val playPublishPlugin = "3.4.0-agp7.0" -- cgit v1.2.3