Merge pull request #25 from tumblr/plugin-dsl-and-javadoc-improvements

Plugin DSL and javadoc improvements

Author: oguzkocer

backboard-example/build.gradle

@@ -1,4 +1,6 @@
-apply plugin: 'com.android.application'
+plugins {
+    id "com.android.application"
+}
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion

backboard-example/src/main/AndroidManifest.xml

@@ -9,6 +9,7 @@
         android:theme="@style/AppTheme" >
         <activity
             android:name=".BackboardActivity"
+            android:exported="true"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

backboard/build.gradle

@@ -1,5 +1,7 @@
-apply plugin: 'com.android.library'
-apply plugin: 'checkstyle'
+plugins {
+    id "com.android.library"
+    id "checkstyle"
+}
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
@@ -19,12 +21,9 @@ android {
 
     libraryVariants.all { variant ->
         task("javadoc${variant.name}", type: Javadoc) {
-            source = variant.javaCompile.source
-            ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
-            classpath = files(android.sourceSets.main.java.srcDirs) + files(ext.androidJar)
+            source android.sourceSets.main.java.srcDirs
+            classpath = variant.javaCompileProvider.get().classpath + files(project.android.getBootClasspath()) + files("$buildDir/intermediates/classes/${variant.name}")
             options.links("http://docs.oracle.com/javase/7/docs/api/")
-            options.linksOffline("http://developer.android.com/reference/", "${android.sdkDirectory}/docs/reference/")
-            options.links("http://facebook.github.io/rebound/javadocs/")
             exclude '**/BuildConfig.java'
             exclude '**/R.java'
         }

build.gradle

@@ -1,40 +1,14 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    repositories {
-		google()
-		jcenter()
-    }
-	dependencies {
-		// NOTE - this is referencing a local variable that you must set in your gradle.properties
-		// in the top level folder.
-		//
-		// Example:
-		//
-		// project.ext {
-		//    localBuildTools = com.android.tools.build:gradle:0.14.1
-		// }
-		//
-		if (project.hasProperty('localBuildTools')) {
-			classpath project.ext.localBuildTools
-		} else {
-			// Fallback to newest build tools if property not set
-			classpath 'com.android.tools.build:gradle:7.1.1'
-		}
-	}
-}
-
 allprojects {
     repositories {
-		google()
-		jcenter()
+	google()
+	mavenCentral()
     }
 }
 
 ext {
-	compileSdkVersion = 28
-	minSdkVersion = 14
-	targetSdkVersion = 28
-	supportAnnotation = 'androidx.annotation:annotation:1.0.0'
-	facebookRebound = "com.facebook.rebound:rebound:0.3.8"
+    compileSdkVersion = 31
+    minSdkVersion = 14
+    targetSdkVersion = 31
+    supportAnnotation = 'androidx.annotation:annotation:1.0.0'
+    facebookRebound = "com.facebook.rebound:rebound:0.3.8"
 }

settings.gradle

@@ -1 +1,14 @@
+pluginManagement {
+    gradle.ext.agpVersion = '7.1.1'
+
+    plugins {
+        id "com.android.application" version gradle.ext.agpVersion
+        id "com.android.library" version gradle.ext.agpVersion
+    }
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
 include ':backboard-example', ':backboard'