Gradle: Use Java 11 & Android Gradle Plugin 8.0.2 (#168)

.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        java_version: [11]
+        java_version: [17]
 
     steps:
       - name: Checkout

.github/workflows/publish-release.yml

@@ -15,11 +15,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Install JDK 11
+      - name: Install JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
 
       - name: Setup gradle
         uses: gradle/gradle-build-action@v2

.github/workflows/publish-snapshot.yml

@@ -15,11 +15,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Install JDK 11
+      - name: Install JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
 
       - name: Setup gradle
         uses: gradle/gradle-build-action@v2

build.gradle

@@ -48,8 +48,9 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.4.2'
+    classpath 'com.android.tools.build:gradle:8.0.2'
     classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22'
+    classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.8.20'
     classpath 'com.vanniktech:gradle-code-quality-tools-plugin:0.22.0'
     classpath 'com.vanniktech:gradle-maven-publish-plugin:0.25.3'
     classpath 'app.cash.licensee:licensee-gradle-plugin:1.7.0'
@@ -78,8 +79,6 @@ codeQualityTools {
 }
 
 subprojects {
-  task allDependencies(type: DependencyReportTask) {}
-
   repositories {
     mavenCentral()
     google()

gradle.properties

@@ -15,13 +15,9 @@ POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=vanniktech
 POM_DEVELOPER_NAME=Niklas Baudy
 
-android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarnings,android.enableR8
-android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=false
 
-android.defaults.buildfeatures.buildconfig=false
-android.defaults.buildfeatures.aidl=false
 android.defaults.buildfeatures.renderscript=false
 android.defaults.buildfeatures.resvalues=false
 android.defaults.buildfeatures.shaders=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.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -85,9 +85,6 @@ done
 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"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -133,26 +130,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=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=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +197,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

rxpermission-testing/build.gradle

@@ -1,14 +1,22 @@
 plugins {
   id("app.cash.licensee")
+  id("com.android.library")
+  id("com.vanniktech.maven.publish")
+  id("org.jetbrains.dokka")
+  id("org.jetbrains.kotlin.android")
 }
 
-apply plugin: 'com.android.library'
-
 licensee {
   allow("Apache-2.0")
   allow("CC0-1.0")
 }
 
+kotlin {
+  jvmToolchain {
+    languageVersion.set(JavaLanguageVersion.of(11))
+  }
+}
+
 android {
   namespace = "com.vanniktech.rxpermission.testing"
 
@@ -21,8 +29,8 @@ android {
   resourcePrefix 'rx_permission_testing_'
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
   }
 }
 
@@ -34,5 +42,3 @@ dependencies {
   testImplementation deps.test.junit
   testImplementation deps.test.assertj3
 }
-
-apply plugin: "com.vanniktech.maven.publish"

rxpermission/build.gradle

@@ -1,6 +1,8 @@
 plugins {
   id("app.cash.licensee")
   id("com.android.library")
+  id("com.vanniktech.maven.publish")
+  id("org.jetbrains.dokka")
   id("org.jetbrains.kotlin.android")
 }
 
@@ -9,6 +11,12 @@ licensee {
   allow("CC0-1.0")
 }
 
+kotlin {
+  jvmToolchain {
+    languageVersion.set(JavaLanguageVersion.of(11))
+  }
+}
+
 android {
   namespace "com.vanniktech.rxpermission"
 
@@ -31,8 +39,8 @@ android {
   resourcePrefix 'rx_permission_'
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
   }
 }
 
@@ -53,5 +61,3 @@ dependencies {
   androidTestImplementation deps.support.test.rules
   androidTestImplementation deps.support.test.uiautomator
 }
-
-apply plugin: "com.vanniktech.maven.publish"

rxpermission/src/main/AndroidManifest.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.vanniktech.rxpermission">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <application>
     <activity
         android:name=".ShadowActivity"

sample/build.gradle

@@ -1,4 +1,13 @@
-apply plugin: 'com.android.application'
+plugins {
+  id("com.android.application")
+  id("org.jetbrains.kotlin.android")
+}
+
+kotlin {
+  jvmToolchain {
+    languageVersion.set(JavaLanguageVersion.of(11))
+  }
+}
 
 android {
   namespace "com.vanniktech.rxpermission.sample"
@@ -15,8 +24,8 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
   }
 
   buildTypes {

sample/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
   <uses-permission android:name="android.permission.CAMERA"/>
+  <uses-feature android:name="android.hardware.camera" android:required="false"/>
 
   <application
       android:allowBackup="true"