From 07b083e570e1d81e1da6e8ae2672f0fa26b34a60 Mon Sep 17 00:00:00 2001
From: Pascal Hartig <realpassy@fb.com>
Date: Thu, 19 Jul 2018 09:39:52 -0700
Subject: [PATCH] Move sample source and resources to gradle dirs

Summary: Follow standard Gradle paths.

Reviewed By: priteshrnandgaonkar

Differential Revision: D8890133

fbshipit-source-id: 062331b6b3d5f118f07cb5ca14cdec871f75867b
---
 android/sample/build.gradle                         |   6 ------
 .../com/facebook/sonar/sample/MainActivity.java     |   0
 .../facebook/sonar/sample/RootComponentSpec.java    |   0
 .../sonar/sample/SonarSampleApplication.java        |   0
 .../main}/res/drawable-hdpi/ic_launcher.png         | Bin
 .../main}/res/drawable-mdpi/ic_launcher.png         | Bin
 .../main}/res/drawable-xhdpi/ic_launcher.png        | Bin
 .../main}/res/drawable-xxhdpi/ic_launcher.png       | Bin
 .../main}/res/drawable-xxxhdpi/ic_launcher.png      | Bin
 .../sample/{ => src/main}/res/values/strings.xml    |   0
 android/sample/{ => src/main}/res/values/styles.xml |   0
 11 files changed, 6 deletions(-)
 rename android/sample/src/{sonar => main/java}/com/facebook/sonar/sample/MainActivity.java (100%)
 rename android/sample/src/{sonar => main/java}/com/facebook/sonar/sample/RootComponentSpec.java (100%)
 rename android/sample/src/{sonar => main/java}/com/facebook/sonar/sample/SonarSampleApplication.java (100%)
 rename android/sample/{ => src/main}/res/drawable-hdpi/ic_launcher.png (100%)
 rename android/sample/{ => src/main}/res/drawable-mdpi/ic_launcher.png (100%)
 rename android/sample/{ => src/main}/res/drawable-xhdpi/ic_launcher.png (100%)
 rename android/sample/{ => src/main}/res/drawable-xxhdpi/ic_launcher.png (100%)
 rename android/sample/{ => src/main}/res/drawable-xxxhdpi/ic_launcher.png (100%)
 rename android/sample/{ => src/main}/res/values/strings.xml (100%)
 rename android/sample/{ => src/main}/res/values/styles.xml (100%)

diff --git a/android/sample/build.gradle b/android/sample/build.gradle
index ed0f5db6d..771e01fc8 100644
--- a/android/sample/build.gradle
+++ b/android/sample/build.gradle
@@ -16,12 +16,6 @@ android {
     sourceSets {
         main {
             manifest.srcFile './AndroidManifest.xml'
-            java {
-                srcDir 'src'
-            }
-            res {
-                srcDir 'res'
-            }
         }
     }
 }
diff --git a/android/sample/src/sonar/com/facebook/sonar/sample/MainActivity.java b/android/sample/src/main/java/com/facebook/sonar/sample/MainActivity.java
similarity index 100%
rename from android/sample/src/sonar/com/facebook/sonar/sample/MainActivity.java
rename to android/sample/src/main/java/com/facebook/sonar/sample/MainActivity.java
diff --git a/android/sample/src/sonar/com/facebook/sonar/sample/RootComponentSpec.java b/android/sample/src/main/java/com/facebook/sonar/sample/RootComponentSpec.java
similarity index 100%
rename from android/sample/src/sonar/com/facebook/sonar/sample/RootComponentSpec.java
rename to android/sample/src/main/java/com/facebook/sonar/sample/RootComponentSpec.java
diff --git a/android/sample/src/sonar/com/facebook/sonar/sample/SonarSampleApplication.java b/android/sample/src/main/java/com/facebook/sonar/sample/SonarSampleApplication.java
similarity index 100%
rename from android/sample/src/sonar/com/facebook/sonar/sample/SonarSampleApplication.java
rename to android/sample/src/main/java/com/facebook/sonar/sample/SonarSampleApplication.java
diff --git a/android/sample/res/drawable-hdpi/ic_launcher.png b/android/sample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from android/sample/res/drawable-hdpi/ic_launcher.png
rename to android/sample/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/android/sample/res/drawable-mdpi/ic_launcher.png b/android/sample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from android/sample/res/drawable-mdpi/ic_launcher.png
rename to android/sample/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/android/sample/res/drawable-xhdpi/ic_launcher.png b/android/sample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from android/sample/res/drawable-xhdpi/ic_launcher.png
rename to android/sample/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/android/sample/res/drawable-xxhdpi/ic_launcher.png b/android/sample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from android/sample/res/drawable-xxhdpi/ic_launcher.png
rename to android/sample/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/android/sample/res/drawable-xxxhdpi/ic_launcher.png b/android/sample/src/main/res/drawable-xxxhdpi/ic_launcher.png
similarity index 100%
rename from android/sample/res/drawable-xxxhdpi/ic_launcher.png
rename to android/sample/src/main/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/android/sample/res/values/strings.xml b/android/sample/src/main/res/values/strings.xml
similarity index 100%
rename from android/sample/res/values/strings.xml
rename to android/sample/src/main/res/values/strings.xml
diff --git a/android/sample/res/values/styles.xml b/android/sample/src/main/res/values/styles.xml
similarity index 100%
rename from android/sample/res/values/styles.xml
rename to android/sample/src/main/res/values/styles.xml