From f1207d24e4f50b5a83229feec195da1bd8a1e4f6 Mon Sep 17 00:00:00 2001
From: Akash Yadav <itsaky01@gmail.com>
Date: Fri, 20 Oct 2023 22:35:25 +0530
Subject: [PATCH] fix: convert 'google-java-format' to an Android module

---
 .idea/compiler.xml                            | 18 +--------
 .../google-java-format/build.gradle.kts       |  7 +++-
 .../java/GoogleJavaFormatToolProvider.java    | 38 -------------------
 3 files changed, 6 insertions(+), 57 deletions(-)
 delete mode 100644 subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/GoogleJavaFormatToolProvider.java

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 4bb4b09a3..e5947d6e1 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -20,23 +20,6 @@
         </processorPath>
         <module name="ide.AndroidIDE.annotation-processors.main" />
       </profile>
-      <profile name="Gradle Imported" enabled="true">
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="false">
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto.value/auto-value/1.10.4/90f9629eaa123f88551cc26a64bc386967ee24cc/auto-value-1.10.4.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto.service/auto-service/1.1.1/bfeb4c40087b49e23700f074807d3f2a6d36d2d1/auto-service-1.1.1.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto.service/auto-service-annotations/1.1.1/da12a15cd058ba90a0ff55357fb521161af4736d/auto-service-annotations-1.1.1.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto/auto-common/1.2.1/f6da26895f759010f5f170c8044e84c1b17ef83e/auto-common-1.2.1.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/32.0.1-jre/6e5d51a72d142f2d40a57dfb897188b36a95b489/guava-32.0.1-jre.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/failureaccess/1.0.1/1dcf1de382a0bf95a3d8b0849546c88bac1292c9/failureaccess-1.0.1.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/b421526c5f297295adef1c886e5246c39d4ac629/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/3.33.0/de2b60b62da487644fc11f734e73c8b0b431238f/checker-qual-3.33.0.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.18.0/89b684257096f548fa39a7df9fdaa409d4d4df91/error_prone_annotations-2.18.0.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/2.8/c85270e307e7b822f1086b93689124b89768e273/j2objc-annotations-2.8.jar" />
-        </processorPath>
-        <module name="google-java-format.AndroidIDE.subprojects.google-java-format.main" />
-      </profile>
     </annotationProcessing>
     <bytecodeTargetLevel target="1.8">
       <module name="AndroidIDE.annotation-ksp" target="17" />
@@ -131,6 +114,7 @@
       <module name="AndroidIDE.subprojects.classfile" target="11" />
       <module name="AndroidIDE.subprojects.classfile.main" target="11" />
       <module name="AndroidIDE.subprojects.classfile.test" target="11" />
+      <module name="AndroidIDE.subprojects.google-java-format.test" target="11" />
       <module name="AndroidIDE.subprojects.java-compiler-utils.main" target="8" />
       <module name="AndroidIDE.subprojects.java-compiler-utils.test" target="8" />
       <module name="AndroidIDE.subprojects.tooling-api-config" target="11" />
diff --git a/subprojects/google-java-format/build.gradle.kts b/subprojects/google-java-format/build.gradle.kts
index 4817c1a7e..1b2097454 100644
--- a/subprojects/google-java-format/build.gradle.kts
+++ b/subprojects/google-java-format/build.gradle.kts
@@ -15,9 +15,12 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-@Suppress("JavaPluginLanguageLevel")
 plugins {
-    id("java-library")
+    id("com.android.library")
+}
+
+android {
+    namespace = "com.google.googlejavaformat"
 }
 
 dependencies {
diff --git a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/GoogleJavaFormatToolProvider.java b/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/GoogleJavaFormatToolProvider.java
deleted file mode 100644
index 7bcad4cc5..000000000
--- a/subprojects/google-java-format/src/main/java/com/google/googlejavaformat/java/GoogleJavaFormatToolProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2021 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.google.googlejavaformat.java;
-
-import com.google.auto.service.AutoService;
-import java.io.PrintWriter;
-import java.util.spi.ToolProvider;
-
-/** Provide a way to be invoked without necessarily starting a new VM. */
-@AutoService(ToolProvider.class)
-public class GoogleJavaFormatToolProvider implements ToolProvider {
-  @Override
-  public String name() {
-    return "google-java-format";
-  }
-
-  @Override
-  public int run(PrintWriter out, PrintWriter err, String... args) {
-    try {
-      return Main.main(out, err, args);
-    } catch (RuntimeException e) {
-      err.print(e.getMessage());
-      return -1; // pass non-zero value back indicating an error has happened
-    }
-  }
-}