diff --git a/build.gradle.kts b/build.gradle.kts index f96eb33..d43a64f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,24 +3,10 @@ import com.android.build.gradle.LibraryExtension import java.io.ByteArrayOutputStream import java.net.URL -// Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("maven-publish") id("java") -} - -buildscript { - repositories { - google() - mavenCentral() - } - - dependencies { - classpath("com.android.tools.build:gradle:8.1.1") - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } + id("maven-publish") + id("com.android.library") version "8.1.1" apply false } val dlPackageList by tasks.registering { @@ -77,35 +63,22 @@ publishing { } fun Project.android(configuration: BaseExtension.() -> Unit) = - extensions.getByName("android").configuration() + extensions.getByName("android").configuration() fun Project.androidLibrary(configuration: LibraryExtension.() -> Unit) = - extensions.getByName("android").configuration() + extensions.getByName("android").configuration() subprojects { - buildscript { - repositories { - google() - mavenCentral() - } - } - - repositories { - google() - mavenCentral() - } - configurations.create("javadocDeps") - afterEvaluate { android { - compileSdkVersion(33) - buildToolsVersion = "33.0.2" + compileSdkVersion(34) + buildToolsVersion = "34.0.0" defaultConfig { if (minSdkVersion == null) minSdk = 19 - targetSdk = 33 + targetSdk = 34 } compileOptions { @@ -136,16 +109,16 @@ subprojects { withJavadocJar() } } + } - afterEvaluate { - this.publishing { - publications { - register("maven") { - from(components["release"]) - groupId = "com.github.topjohnwu" - artifactId = project.name - } + publishing { + publications { + register("libsu") { + afterEvaluate { + from(components["release"]) } + groupId = "com.github.topjohnwu.libsu" + artifactId = project.name } } } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 74a531d..3fa4442 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -12,7 +12,6 @@ android { } dependencies { - implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))) - api("androidx.annotation:annotation:1.3.0") - javadocDeps("androidx.annotation:annotation:1.3.0") -} + compileOnly("androidx.annotation:annotation:1.6.0") + javadocDeps("androidx.annotation:annotation:1.6.0") + } diff --git a/example/build.gradle.kts b/example/build.gradle.kts index 19d9f9e..c263205 100644 --- a/example/build.gradle.kts +++ b/example/build.gradle.kts @@ -40,7 +40,7 @@ android { } dependencies { - implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))) + implementation("androidx.annotation:annotation:1.6.0") implementation(project(":core")) implementation(project(":service")) implementation(project(":io")) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..7f93135 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4205f6..ac72c34 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb..0adc8e1 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +198,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in diff --git a/gradlew.bat b/gradlew.bat index 53a6b23..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/io/build.gradle.kts b/io/build.gradle.kts index 257958e..f50cad1 100644 --- a/io/build.gradle.kts +++ b/io/build.gradle.kts @@ -12,7 +12,7 @@ android { } dependencies { - implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))) + compileOnly("androidx.annotation:annotation:1.6.0") api(project(":core")) api(project(":nio")) } diff --git a/nio/build.gradle.kts b/nio/build.gradle.kts index 5d7636f..2450199 100644 --- a/nio/build.gradle.kts +++ b/nio/build.gradle.kts @@ -15,6 +15,6 @@ android { } dependencies { - implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))) - api("androidx.annotation:annotation:1.3.0") + compileOnly("androidx.annotation:annotation:1.6.0") + javadocDeps("androidx.annotation:annotation:1.6.0") } diff --git a/service/build.gradle.kts b/service/build.gradle.kts index b825623..6f75204 100644 --- a/service/build.gradle.kts +++ b/service/build.gradle.kts @@ -64,6 +64,6 @@ android.libraryVariants.all { } dependencies { - implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))) + compileOnly("androidx.annotation:annotation:1.6.0") api(project(":core")) } diff --git a/settings.gradle.kts b/settings.gradle.kts index 13d3a8a..654f16a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1 +1,18 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } + plugins { + embeddedKotlin("android") + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include(":example", ":core", ":service", ":nio", ":io")