Migrate to gradle 8.2.0 (#115)

* Migrate to gradle 8.2.0

* Migrate to namespaces

* Migrate gha to java 17

* New api dump

.github/workflows/check.yml

@@ -18,10 +18,11 @@ jobs:
           key: cache-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }}
           restore-keys: cache-gradle-
 
-      - name: Setup Java 15
-        uses: actions/setup-java@v1
+      - name: Setup Java 17
+        uses: actions/setup-java@v3
         with:
-          java-version: '15'
+          distribution: zulu
+          java-version: 17
 
       - name: Run Detekt
         run: ./gradlew detekt --stacktrace
@@ -44,10 +45,11 @@ jobs:
           key: cache-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }}
           restore-keys: cache-gradle-
 
-      - name: Setup Java 15
-        uses: actions/setup-java@v1
+      - name: Setup Java 17
+        uses: actions/setup-java@v3
         with:
-          java-version: '15'
+          distribution: zulu
+          java-version: 17
 
       - name: Run Debug Unit Tests
         run: ./gradlew test --stacktrace
@@ -71,10 +73,11 @@ jobs:
           key: cache-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }}
           restore-keys: cache-gradle-
 
-      - name: Setup Java 15
-        uses: actions/setup-java@v1
+      - name: Setup Java 17
+        uses: actions/setup-java@v3
         with:
-          java-version: '15'
+          distribution: zulu
+          java-version: 17
 
       - name: Build app and test APKs
         run: ./gradlew :sample:assembleDebug && ./gradlew  :sample:assembleDebugAndroidTest
@@ -114,10 +117,11 @@ jobs:
           key: cache-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }}
           restore-keys: cache-gradle-
 
-      - name: Setup Java 15
-        uses: actions/setup-java@v1
+      - name: Setup Java 17
+        uses: actions/setup-java@v3
         with:
-          java-version: '15'
+          distribution: zulu
+          java-version: 17
 
       - name: Check API compatibility
         run: ./gradlew apiCheck

.github/workflows/publish-snapshot.yml

@@ -24,10 +24,11 @@ jobs:
           key: cache-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }}
           restore-keys: cache-gradle-
 
-      - name: Setup Java 15
-        uses: actions/setup-java@v1
+      - name: Setup Java 17
+        uses: actions/setup-java@v3
         with:
-          java-version: '15'
+          distribution: zulu
+          java-version: 17
 
       - name: Deploy Snapshot
         env:

.github/workflows/publish.yml

@@ -24,10 +24,11 @@ jobs:
           key: cache-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }}
           restore-keys: cache-gradle-
 
-      - name: Setup Java 15
-        uses: actions/setup-java@v1
+      - name: Setup Java 17
+        uses: actions/setup-java@v3
         with:
-          java-version: '15'
+          distribution: zulu
+          java-version: 17
 
       - name: Deploy Release
         env:

build.gradle.kts

@@ -38,7 +38,7 @@ allprojects {
 
   tasks.withType<KotlinCompile> {
     kotlinOptions {
-      jvmTarget = "11"
+      jvmTarget = "17"
       freeCompilerArgs = freeCompilerArgs + listOf(
         "-progressive",
         "-Xopt-in=kotlin.RequiresOptIn",

buildSrc/build.gradle.kts

@@ -17,6 +17,6 @@ gradlePlugin {
 }
 
 dependencies {
-  implementation("com.android.tools.build:gradle:7.4.2")
+  implementation("com.android.tools.build:gradle:8.2.0")
   implementation(kotlin("gradle-plugin", "1.8.10"))
 }

buildSrc/src/main/kotlin/CommonAndroidPlugin.kt

@@ -1,5 +1,5 @@
 import com.android.build.gradle.BaseExtension
-import org.gradle.api.JavaVersion.VERSION_11
+import org.gradle.api.JavaVersion.VERSION_17
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 
@@ -18,8 +18,8 @@ class CommonAndroidPlugin : Plugin<Project> {
       }
 
       compileOptions {
-        sourceCompatibility = VERSION_11
-        targetCompatibility = VERSION_11
+        sourceCompatibility = VERSION_17
+        targetCompatibility = VERSION_17
         isCoreLibraryDesugaringEnabled = true
       }
 

buildSrc/src/main/kotlin/Dependencies.kt

@@ -11,7 +11,7 @@ object AndroidSdk {
 }
 
 object Kotlin {
-  const val Version = "1.8.10"
+  const val Version = "1.9.20"
   const val CompatibilityPluginVersion = "0.11.0"
 
   const val GradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$Version"
@@ -32,7 +32,7 @@ object Kotlin {
 }
 
 object Android {
-  const val GradlePlugin = "com.android.tools.build:gradle:7.4.2"
+  const val GradlePlugin = "com.android.tools.build:gradle:8.2.0"
 
   const val ApplicationPluginId = "com.android.application"
   const val LibraryPluginId = "com.android.library"

gradle.properties

@@ -22,3 +22,6 @@ POM_LICENCE_URL=https://www.apache.org/licenses/LICENSE-2.0.txt
 POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=boguszp
 POM_DEVELOPER_NAME=Bogusz Pawlowski
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,10 +83,8 @@ done
 # 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"'
+# 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,26 +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 
+        # shellcheck disable=SC2039,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 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# 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
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# 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, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

library/api/library.api

@@ -1,4 +1,4 @@
-public final class com/boguszpawlowski/composecalendar/BuildConfig {
+public final class io/github/boguszpawlowski/composecalendar/BuildConfig {
 	public static final field BUILD_TYPE Ljava/lang/String;
 	public static final field DEBUG Z
 	public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;

library/build.gradle.kts

@@ -8,6 +8,7 @@ plugins {
 }
 
 android {
+  namespace = "io.github.boguszpawlowski.composecalendar"
   tasks.withType<KotlinCompile> {
     kotlinOptions {
       freeCompilerArgs = freeCompilerArgs + "-Xexplicit-api=strict" + "-Xcontext-receivers"

library/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.boguszpawlowski.composecalendar">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>

sample/build.gradle.kts

@@ -9,15 +9,17 @@ plugins {
 val commitsCount = Grgit.open(mapOf("dir" to rootDir)).log().size
 
 android {
+  namespace = "io.github.boguszpawlowski.composecalendar.sample"
   defaultConfig {
     versionCode = commitsCount
     versionName = "0.0.1"
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
 
-  packagingOptions {
-    exclude("META-INF/AL2.0")
-    exclude("META-INF/LGPL2.1")
+  packaging {
+    resources {
+      excludes.addAll(listOf("META-INF/AL2.0", "META-INF/LGPL2.1"))
+    }
   }
 }
 

sample/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.github.boguszpawlowski.composecalendar">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 
     <application