From f40dc20f7152aae1f998f7547550aa591834d6ea Mon Sep 17 00:00:00 2001
From: Tor Norbye <tnorbye@google.com>
Date: Tue, 5 Jun 2018 13:23:02 -0700
Subject: [PATCH] Update metalava to build & run with 3.2.0-alpha16
Change-Id: I153d1abda7e4192714cf72ffddb2334262097d22
---
.gitignore | 1 +
build.gradle | 4 ++--
src/main/java/com/android/tools/metalava/Driver.kt | 4 ++--
.../tools/metalava/apilevels/AndroidJarReader.java | 10 +++++-----
.../android/tools/metalava/apilevels/ApiClass.java | 4 ++--
.../tools/metalava/apilevels/ApiElement.java | 4 ++--
.../tools/metalava/apilevels/ApiGenerator.java | 14 +++++++-------
.../android/tools/metalava/doclava1/Errors.java | 2 +-
.../metalava/doclava1/SourcePositionInfo.java | 4 ++--
9 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/.gitignore b/.gitignore
index fffd916..dd93b08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,6 @@
/.idea/workspace.xml
/.idea/runConfigurations
/out
+build/
stub-annotations/out
.DS_Store
diff --git a/build.gradle b/build.gradle
index 0554658..4456034 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
buildscript {
- ext.gradle_version = '3.2.0-alpha15'
- ext.studio_version = '26.2.0-alpha15'
+ ext.gradle_version = '3.2.0-alpha16'
+ ext.studio_version = '26.2.0-alpha16'
ext.kotlin_version = '1.2.41'
repositories {
google()
diff --git a/src/main/java/com/android/tools/metalava/Driver.kt b/src/main/java/com/android/tools/metalava/Driver.kt
index 820d694..0597abe 100644
--- a/src/main/java/com/android/tools/metalava/Driver.kt
+++ b/src/main/java/com/android/tools/metalava/Driver.kt
@@ -470,7 +470,7 @@ private fun loadFromSources(): Codebase {
val project = projectEnvironment.project
val kotlinFiles = sources.filter { it.path.endsWith(SdkConstants.DOT_KT) }
- KotlinLintAnalyzerFacade.analyze(kotlinFiles, joined, project)
+ KotlinLintAnalyzerFacade().analyze(kotlinFiles, joined, project)
val units = Extractor.createUnitsForFiles(project, sources)
val packageDocs = gatherHiddenPackagesFromJavaDocs(options.sourcePath)
@@ -541,7 +541,7 @@ private fun loadFromJarFile(apiJar: File, manifest: File? = null): Codebase {
projectEnvironment.registerPaths(listOf(apiJar))
val kotlinFiles = emptyList<File>()
- KotlinLintAnalyzerFacade.analyze(kotlinFiles, listOf(apiJar), project)
+ KotlinLintAnalyzerFacade().analyze(kotlinFiles, listOf(apiJar), project)
val codebase = PsiBasedCodebase()
codebase.description = "Codebase loaded from $apiJar"
diff --git a/src/main/java/com/android/tools/metalava/apilevels/AndroidJarReader.java b/src/main/java/com/android/tools/metalava/apilevels/AndroidJarReader.java
index 52d1e17..c5a7d59 100644
--- a/src/main/java/com/android/tools/metalava/apilevels/AndroidJarReader.java
+++ b/src/main/java/com/android/tools/metalava/apilevels/AndroidJarReader.java
@@ -15,11 +15,11 @@
*/
package com.android.tools.metalava.apilevels;
-import com.android.annotations.NonNull;
-import com.android.annotations.Nullable;
import com.android.tools.metalava.model.Codebase;
import com.google.common.io.ByteStreams;
import com.google.common.io.Closeables;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.ClassNode;
@@ -44,9 +44,9 @@ public class AndroidJarReader {
private File[] mApiLevels;
private final Codebase mCodebase;
- AndroidJarReader(@NonNull List<String> patterns,
+ AndroidJarReader(@NotNull List<String> patterns,
int minApi,
- @NonNull File currentJar,
+ @NotNull File currentJar,
int currentApi,
@Nullable Codebase codebase) {
mPatterns = patterns;
@@ -56,7 +56,7 @@ public class AndroidJarReader {
mCodebase = codebase;
}
- AndroidJarReader(@NonNull File[] apiLevels, @Nullable Codebase codebase) {
+ AndroidJarReader(@NotNull File[] apiLevels, @Nullable Codebase codebase) {
mApiLevels = apiLevels;
mCodebase = codebase;
}
diff --git a/src/main/java/com/android/tools/metalava/apilevels/ApiClass.java b/src/main/java/com/android/tools/metalava/apilevels/ApiClass.java
index 97a3b4a..d215ec0 100644
--- a/src/main/java/com/android/tools/metalava/apilevels/ApiClass.java
+++ b/src/main/java/com/android/tools/metalava/apilevels/ApiClass.java
@@ -15,8 +15,8 @@
*/
package com.android.tools.metalava.apilevels;
-import com.android.annotations.NonNull;
import com.google.common.collect.Iterables;
+import org.jetbrains.annotations.NotNull;
import java.io.PrintStream;
import java.util.ArrayList;
@@ -53,7 +53,7 @@ public class ApiClass extends ApiElement {
addToArray(mSuperClasses, superClass, since);
}
- @NonNull
+ @NotNull
List<ApiElement> getSuperClasses() {
return mSuperClasses;
}
diff --git a/src/main/java/com/android/tools/metalava/apilevels/ApiElement.java b/src/main/java/com/android/tools/metalava/apilevels/ApiElement.java
index ec756c3..ab5af66 100644
--- a/src/main/java/com/android/tools/metalava/apilevels/ApiElement.java
+++ b/src/main/java/com/android/tools/metalava/apilevels/ApiElement.java
@@ -15,7 +15,7 @@
*/
package com.android.tools.metalava.apilevels;
-import com.android.annotations.NonNull;
+import org.jetbrains.annotations.NotNull;
import java.io.PrintStream;
import java.util.ArrayList;
@@ -225,7 +225,7 @@ public class ApiElement implements Comparable<ApiElement> {
}
@Override
- public int compareTo(@NonNull ApiElement other) {
+ public int compareTo(@NotNull ApiElement other) {
return mName.compareTo(other.mName);
}
}
diff --git a/src/main/java/com/android/tools/metalava/apilevels/ApiGenerator.java b/src/main/java/com/android/tools/metalava/apilevels/ApiGenerator.java
index 5891a4b..afcac41 100644
--- a/src/main/java/com/android/tools/metalava/apilevels/ApiGenerator.java
+++ b/src/main/java/com/android/tools/metalava/apilevels/ApiGenerator.java
@@ -16,9 +16,9 @@
package com.android.tools.metalava.apilevels;
-import com.android.annotations.NonNull;
-import com.android.annotations.Nullable;
import com.android.tools.metalava.model.Codebase;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.IOException;
@@ -147,17 +147,17 @@ public class ApiGenerator {
private static boolean generate(int minApi,
int currentApi,
- @NonNull File currentJar,
- @NonNull List<String> patterns,
- @NonNull String outPath,
+ @NotNull File currentJar,
+ @NotNull List<String> patterns,
+ @NotNull String outPath,
@Nullable Codebase codebase) throws IOException {
AndroidJarReader reader = new AndroidJarReader(patterns, minApi, currentJar, currentApi, codebase);
Api api = reader.getApi();
return createApiFile(new File(outPath), api);
}
- public static boolean generate(@NonNull File[] apiLevels,
- @NonNull File outputFile,
+ public static boolean generate(@NotNull File[] apiLevels,
+ @NotNull File outputFile,
@Nullable Codebase codebase) throws IOException {
AndroidJarReader reader = new AndroidJarReader(apiLevels, codebase);
Api api = reader.getApi();
diff --git a/src/main/java/com/android/tools/metalava/doclava1/Errors.java b/src/main/java/com/android/tools/metalava/doclava1/Errors.java
index 3f67cb8..93ceee1 100644
--- a/src/main/java/com/android/tools/metalava/doclava1/Errors.java
+++ b/src/main/java/com/android/tools/metalava/doclava1/Errors.java
@@ -15,9 +15,9 @@
*/
package com.android.tools.metalava.doclava1;
-import com.android.annotations.Nullable;
import com.android.tools.metalava.Severity;
import com.google.common.base.Splitter;
+import org.jetbrains.annotations.Nullable;
import java.lang.reflect.Field;
import java.util.ArrayList;
diff --git a/src/main/java/com/android/tools/metalava/doclava1/SourcePositionInfo.java b/src/main/java/com/android/tools/metalava/doclava1/SourcePositionInfo.java
index 015533c..a7f098e 100644
--- a/src/main/java/com/android/tools/metalava/doclava1/SourcePositionInfo.java
+++ b/src/main/java/com/android/tools/metalava/doclava1/SourcePositionInfo.java
@@ -16,7 +16,7 @@
package com.android.tools.metalava.doclava1;
-import com.android.annotations.NonNull;
+import org.jetbrains.annotations.NotNull;
// Copied from doclava1
public class SourcePositionInfo implements Comparable {
@@ -55,7 +55,7 @@ public class SourcePositionInfo implements Comparable {
return file + ':' + line;
}
- public int compareTo(@NonNull Object o) {
+ public int compareTo(@NotNull Object o) {
SourcePositionInfo that = (SourcePositionInfo) o;
int r = this.file.compareTo(that.file);
if (r != 0) return r;
--
GitLab