1
+ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2
+
1
3
// Module :library
2
4
plugins {
3
5
alias(libs.plugins.android.library)
@@ -9,6 +11,7 @@ plugins {
9
11
10
12
kotlin {
11
13
compilerOptions {
14
+ jvmTarget = JvmTarget .JVM_17
12
15
freeCompilerArgs.addAll(
13
16
listOf (" -Xlint:unchecked" , " -Xlint:deprecation" )
14
17
)
@@ -23,6 +26,7 @@ android {
23
26
namespace = " io.syslogic.colorpicker"
24
27
buildToolsVersion = libs.versions.android.build.tools.get()
25
28
compileSdk = Integer .parseInt(libs.versions.android.compile.sdk.get())
29
+
26
30
defaultConfig {
27
31
minSdk = Integer .parseInt(libs.versions.android.min.sdk.get())
28
32
testInstrumentationRunner = " androidx.test.runner.AndroidJUnitRunner"
@@ -42,10 +46,6 @@ android {
42
46
targetCompatibility = JavaVersion .VERSION_17
43
47
}
44
48
45
- kotlinOptions {
46
- jvmTarget = " 17"
47
- }
48
-
49
49
composeCompiler {
50
50
reportsDestination = layout.buildDirectory.dir(" compose_compiler" )
51
51
}
@@ -121,8 +121,8 @@ val javadoc by tasks.registering(Javadoc::class) {
121
121
source = android.sourceSets.getByName(" main" ).java.getSourceFiles()
122
122
configurations[" implementation" ].isCanBeResolved = true
123
123
124
- android.bootClasspath.forEach { classpath + = fileTree(it) }
125
124
classpath = files(File (" ${android.sdkDirectory} /platforms/${android.compileSdkVersion} /android.jar" ))
125
+ android.bootClasspath.forEach { classpath + = fileTree(it) }
126
126
classpath + = fileTree(project.file(" build/tmp/aarsToJars/" ).absolutePath)
127
127
classpath + = configurations.implementation.get() as FileCollection
128
128
isFailOnError = false
@@ -136,7 +136,7 @@ val javadoc by tasks.registering(Javadoc::class) {
136
136
(options as StandardJavadocDocletOptions ).linkSource(true )
137
137
(options as StandardJavadocDocletOptions ).author(true )
138
138
139
- setDestinationDir( project.file(" build/outputs/javadoc" ) )
139
+ destinationDir = project.file(" build/outputs/javadoc" )
140
140
exclude(" **/BuildConfig.java" , " **/R.java" , " **/*.kt" )
141
141
142
142
doFirst {
@@ -145,7 +145,6 @@ val javadoc by tasks.registering(Javadoc::class) {
145
145
configurations[" implementation" ].files
146
146
.filter { it.name.endsWith(" .aar" ) }
147
147
.forEach { aar: File ->
148
- // println(aar.name)
149
148
copy {
150
149
from(zipTree(aar))
151
150
include(" **/classes.jar" )
0 commit comments