Merge pull request #471 from skydoves/agp/8.1.0

Bump AGP 8.1.0, Gradle 8.3.0 and the rest of libraries
skydoves · Aug 26, 2023 · b694888 · b694888
2 parents ec0c62f + 8314b44
commit b694888
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 37 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -22,6 +22,8 @@ plugins {
 
 android {
  compileSdk = Configuration.compileSdk
+ namespace = "com.skydoves.balloondemo"
+
  defaultConfig {
  applicationId = "com.skydoves.balloondemo"
  minSdk = Configuration.minSdk
@@ -31,12 +33,12 @@ android {
  }
 
  compileOptions {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
  }
 
  kotlinOptions {
- jvmTarget = libs.versions.jvmTarget.get()
+ jvmTarget = "17"
  }
 
  buildFeatures {

diff --git a/balloon-compose/build.gradle.kts b/balloon-compose/build.gradle.kts
@@ -16,9 +16,10 @@ apply(from ="${rootDir}/scripts/publish-module.gradle")
 
 android {
  compileSdk = Configuration.compileSdk
+ namespace = "com.skydoves.balloon.compose"
+
  defaultConfig {
  minSdk = Configuration.minSdk
- targetSdk = Configuration.targetSdk
  }
 
  buildFeatures {
@@ -29,7 +30,16 @@ android {
  kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get()
  }
 
- packagingOptions {
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
+ }
+
+ kotlinOptions {
+ jvmTarget = libs.versions.jvmTarget.get()
+ }
+
+ packaging {
  resources {
  excludes.add("/META-INF/{AL2.0,LGPL2.1}")
  }
@@ -47,6 +57,11 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
  )
 }
 
+tasks.withType(JavaCompile::class.java).configureEach {
+ this.targetCompatibility = libs.versions.jvmTarget.get()
+ this.sourceCompatibility = libs.versions.jvmTarget.get()
+}
+
 dependencies {
  api(project(":balloon"))
 

diff --git a/balloon/build.gradle.kts b/balloon/build.gradle.kts
@@ -30,9 +30,10 @@ apply(from ="${rootDir}/scripts/publish-module.gradle")
 
 android {
  compileSdk = Configuration.compileSdk
+ namespace = "com.skydoves.balloon"
+
  defaultConfig {
  minSdk = Configuration.minSdk
- targetSdk = Configuration.targetSdk
  }
 
  resourcePrefix = "balloon"
@@ -42,8 +43,8 @@ android {
  }
 
  compileOptions {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
  }
 
  kotlinOptions {
@@ -56,9 +57,12 @@ android {
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
- kotlinOptions.freeCompilerArgs += listOf(
- "-Xexplicit-api=strict"
- )
+ kotlinOptions.freeCompilerArgs += listOf("-Xexplicit-api=strict")
+}
+
+tasks.withType(JavaCompile::class.java).configureEach {
+ this.targetCompatibility = libs.versions.jvmTarget.get()
+ this.sourceCompatibility = libs.versions.jvmTarget.get()
 }
 
 dependencies {

diff --git a/balloon/src/main/kotlin/com/skydoves/balloon/overlay/BalloonAnchorOverlayView.kt b/balloon/src/main/kotlin/com/skydoves/balloon/overlay/BalloonAnchorOverlayView.kt
@@ -91,14 +91,14 @@ public class BalloonAnchorOverlayView @JvmOverloads constructor(
  invalidate()
  }
 
- override fun dispatchDraw(canvas: Canvas?) {
+ override fun dispatchDraw(canvas: Canvas) {
  if (invalidated || bitmap == null || bitmap?.isRecycled == true) {
  prepareBitmap()
  }
 
  val bitmap = this.bitmap
  if (bitmap != null && !bitmap.isRecycled) {
- canvas?.drawBitmap(bitmap, 0f, 0f, null)
+ canvas.drawBitmap(bitmap, 0f, 0f, null)
  }
  }
 
@@ -172,10 +172,12 @@ public class BalloonAnchorOverlayView @JvmOverloads constructor(
  canvas.drawRect(anchorRect, paint)
  canvas.drawRect(anchorPaddingRect, paddingColorPaint)
  }
+
  is BalloonOverlayOval -> {
  canvas.drawOval(anchorRect, paint)
  canvas.drawOval(anchorPaddingRect, paddingColorPaint)
  }
+
  is BalloonOverlayCircle -> {
  overlay.radius?.let { radius ->
  canvas.drawCircle(anchorRect.centerX(), anchorRect.centerY(), radius, paint)
@@ -201,6 +203,7 @@ public class BalloonAnchorOverlayView @JvmOverloads constructor(
  )
  }
  }
+
  is BalloonOverlayRoundRect -> {
  overlay.radiusPair?.let { radiusPair ->
  canvas.drawRoundRect(anchorRect, radiusPair.first, radiusPair.second, paint)

diff --git a/benchmark-app/build.gradle.kts b/benchmark-app/build.gradle.kts
@@ -22,6 +22,8 @@ plugins {
 
 android {
  compileSdk = Configuration.compileSdk
+ namespace = "com.skydoves.balloon.benchmark.app"
+
  defaultConfig {
  applicationId = "com.skydoves.balloon.benchmark.app"
  minSdk = Configuration.minSdk
@@ -31,12 +33,12 @@ android {
  }
 
  compileOptions {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
  }
 
  kotlinOptions {
- jvmTarget = libs.versions.jvmTarget.get()
+ jvmTarget = "17"
  }
 
  buildFeatures {

diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 
 android {
  compileSdk = Configuration.compileSdk
+ namespace = "com.skydoves.balloon.benchmark"
 
  defaultConfig {
  minSdk = Configuration.minSdkBenchmark

diff --git a/buildSrc/src/main/kotlin/com/skydoves/balloon/Configuration.kt b/buildSrc/src/main/kotlin/com/skydoves/balloon/Configuration.kt
@@ -17,8 +17,8 @@
 package com.skydoves.balloon
 
 object Configuration {
- const val compileSdk = 33
- const val targetSdk = 33
+ const val compileSdk = 34
+ const val targetSdk = 34
  const val minSdk = 21
  const val minSdkBenchmark = 23
  const val majorVersion = 1

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,24 +1,23 @@
 [versions]
-agp = "7.4.1"
-dokka = "1.8.10"
+agp = "8.1.0"
+dokka = "1.8.20"
 nexusPlugin = "1.3.0"
-kotlin = "1.8.10"
-kotlinBinaryCompatibility = "0.13.1"
-javaRelease = "8"
-jvmTarget = "1.8"
-androidxComposeBom = "2023.06.00"
-androidxComposeCompiler = "1.4.4"
+kotlin = "1.9.0"
+kotlinBinaryCompatibility = "0.13.2"
+jvmTarget = "11"
+androidxComposeBom = "2023.08.00"
+androidxComposeCompiler = "1.5.1"
 androidxComposeConstraintLayout = "1.0.1"
 androidxMaterial = "1.9.0"
 androidxAppcompat = "1.6.1"
 androidxActivity = "1.7.2"
-androidxFragment = "1.6.0"
+androidxFragment = "1.6.1"
 androidxLifecycle = "2.6.1"
 androidxAnnotation = "1.6.0"
 androidxTest = "1.5.2"
 baselineProfiles = "1.3.1"
-macroBenchmark = "1.2.0-alpha12"
-uiAutomator = "2.3.0-alpha02"
+macroBenchmark = "1.2.0-beta04"
+uiAutomator = "2.3.0-alpha04"
 spotless = "6.7.2"
 
 [plugins]
@@ -32,9 +31,6 @@ kotlin-binary-compatibility = { id = "org.jetbrains.kotlinx.binary-compatibility
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
 
 [libraries]
-agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }
-kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
-
 androidx-material = { module = "com.google.android.material:material", version.ref = "androidxMaterial" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidxAppcompat" }
 androidx-fragment = { module = "androidx.fragment:fragment-ktx", version.ref = "androidxFragment" }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git 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,10 +80,10 @@ 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##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # 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"'
@@ -143,12 +143,16 @@ fi
 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

diff --git 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%