Skip to content

Commit 5157bad

Browse files
committed
directory structure simplified; dependency-type changes.
1 parent 39adad4 commit 5157bad

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

build.gradle.kts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ project.ext.set("plugin_version", buildSrc.versions.plugin.version.get())
1616

1717
dependencies {
1818

19-
compileOnly(dependencyNotation = gradleApi())
19+
api(dependencyNotation = gradleApi())
2020
//noinspection DependencyNotationArgument
21-
implementation(dependencyNotation = buildSrc.android.gradle)
21+
api(dependencyNotation = buildSrc.android.gradle)
22+
2223
//noinspection DependencyNotationArgument
2324
implementation(dependencyNotation = buildSrc.annotations)
2425
//noinspection DependencyNotationArgument
@@ -61,7 +62,7 @@ val implCls: Configuration by configurations.creating {
6162
val javadocs by tasks.registering(Javadoc::class) {
6263
title = "${project.ext.get("plugin_display_name")} ${project.ext.get("plugin_version")} API"
6364
classpath += implCls.asFileTree.filter {it.extension == "jar"}
64-
setDestinationDir(project.file("/build/outputs/javadoc"))
65+
setDestinationDir(project.file("/build/javadoc"))
6566
source = sourceSets.main.get().allJava
6667
// options.links = "https://docs.oracle.com/en/java/javase/17/docs/api/"
6768
// options.linkSource = true
@@ -71,7 +72,7 @@ val javadocs by tasks.registering(Javadoc::class) {
7172

7273
val javadocJar by tasks.registering(Jar::class) {
7374
archiveClassifier.set("javadoc")
74-
from(project.file("/build/outputs/javadoc"))
75+
from(project.file("/build/javadoc"))
7576
dependsOn(javadocs)
7677
}
7778

src/main/java/io/syslogic/agconnect/PublishingPlugin.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ void registerPublishReleaseTask(
363363

364364
/** Obtain Android ApplicationBuildType, which have a ApkSigningConfig. */
365365
@NotNull
366+
@SuppressWarnings("NewApi")
366367
String[] getBuildTypes(@NotNull Project project) {
367368
ArrayList<String> buildTypes = new ArrayList<>();
368369
ApplicationExtension android = (ApplicationExtension) project.getExtensions().getByName("android");

0 commit comments

Comments
 (0)