Restructure directories for sample applications. (#496)

Moved `sentry-sample` Android application to `sentry-samples/sentry-samples-android`.
getsentry · Jul 27, 2020 · de86043 · de86043
1 parent 89b011b
commit de86043
Show file tree

Hide file tree

Showing 28 changed files with 5 additions and 5 deletions.
diff --git a/sentry-sample/.gitignore → ...samples/sentry-samples-android/.gitignore b/sentry-sample/.gitignore → ...samples/sentry-samples-android/.gitignore
diff --git a/sentry-sample/CMakeLists.txt → ...les/sentry-samples-android/CMakeLists.txt b/sentry-sample/CMakeLists.txt → ...les/sentry-samples-android/CMakeLists.txt
@@ -3,7 +3,7 @@ project(Sentry-Sample LANGUAGES C CXX)
 
 add_library(native-sample SHARED src/main/cpp/native-sample.cpp)
 
-add_subdirectory(../sentry-android-ndk/${SENTRY_NATIVE_SRC} sentry_build)
+add_subdirectory(../../sentry-android-ndk/${SENTRY_NATIVE_SRC} sentry_build)
 
 find_library(LOG_LIB log)
 

diff --git a/sentry-sample/build.gradle.kts → ...s/sentry-samples-android/build.gradle.kts b/sentry-sample/build.gradle.kts → ...s/sentry-samples-android/build.gradle.kts
@@ -8,19 +8,19 @@ android {
     buildToolsVersion(Config.Android.buildToolsVersion)
 
     defaultConfig {
-        applicationId = "io.sentry.sample"
+        applicationId = "io.sentry.samples.android"
         minSdkVersion(Config.Android.minSdkVersionNdk)
         targetSdkVersion(Config.Android.targetSdkVersion)
         versionCode = 2
         versionName = "1.1.0"
 
         externalNativeBuild {
-            val sentryNativeSrc = if (File("${project.projectDir}/../sentry-android-ndk/sentry-native-local").exists()) {
+            val sentryNativeSrc = if (File("${project.projectDir}/../../sentry-android-ndk/sentry-native-local").exists()) {
                 "sentry-native-local"
             } else {
                 "sentry-native"
             }
-            println("sentry-sample: $sentryNativeSrc")
+            println("sentry-samples-android: $sentryNativeSrc")
 
             cmake {
                 arguments.add(0, "-DANDROID_STL=c++_static")

diff --git a/sentry-sample/proguard-rules.pro → ...sentry-samples-android/proguard-rules.pro b/sentry-sample/proguard-rules.pro → ...sentry-samples-android/proguard-rules.pro
diff --git a/sentry-sample/src/main/AndroidManifest.xml → ...ples-android/src/main/AndroidManifest.xml b/sentry-sample/src/main/AndroidManifest.xml → ...ples-android/src/main/AndroidManifest.xml
diff --git a/sentry-sample/src/main/cpp/native-sample.cpp → ...es-android/src/main/cpp/native-sample.cpp b/sentry-sample/src/main/cpp/native-sample.cpp → ...es-android/src/main/cpp/native-sample.cpp
diff --git a/...n/java/io/sentry/sample/MainActivity.java → ...n/java/io/sentry/sample/MainActivity.java b/...n/java/io/sentry/sample/MainActivity.java → ...n/java/io/sentry/sample/MainActivity.java
diff --git a/.../java/io/sentry/sample/MyApplication.java → .../java/io/sentry/sample/MyApplication.java b/.../java/io/sentry/sample/MyApplication.java → .../java/io/sentry/sample/MyApplication.java
diff --git a/...n/java/io/sentry/sample/NativeSample.java → ...n/java/io/sentry/sample/NativeSample.java b/...n/java/io/sentry/sample/NativeSample.java → ...n/java/io/sentry/sample/NativeSample.java
diff --git a/...s/drawable-v24/ic_launcher_foreground.xml → ...s/drawable-v24/ic_launcher_foreground.xml b/...s/drawable-v24/ic_launcher_foreground.xml → ...s/drawable-v24/ic_launcher_foreground.xml
diff --git a/...n/res/drawable/ic_launcher_background.xml → ...n/res/drawable/ic_launcher_background.xml b/...n/res/drawable/ic_launcher_background.xml → ...n/res/drawable/ic_launcher_background.xml
diff --git a/...ple/src/main/res/layout/activity_main.xml → ...oid/src/main/res/layout/activity_main.xml b/...ple/src/main/res/layout/activity_main.xml → ...oid/src/main/res/layout/activity_main.xml
diff --git a/...ain/res/mipmap-anydpi-v26/ic_launcher.xml → ...ain/res/mipmap-anydpi-v26/ic_launcher.xml b/...ain/res/mipmap-anydpi-v26/ic_launcher.xml → ...ain/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml b/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/.../src/main/res/mipmap-hdpi/ic_launcher.png → .../src/main/res/mipmap-hdpi/ic_launcher.png b/.../src/main/res/mipmap-hdpi/ic_launcher.png → .../src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/...ain/res/mipmap-hdpi/ic_launcher_round.png → ...ain/res/mipmap-hdpi/ic_launcher_round.png b/...ain/res/mipmap-hdpi/ic_launcher_round.png → ...ain/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/.../src/main/res/mipmap-mdpi/ic_launcher.png → .../src/main/res/mipmap-mdpi/ic_launcher.png b/.../src/main/res/mipmap-mdpi/ic_launcher.png → .../src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/...ain/res/mipmap-mdpi/ic_launcher_round.png → ...ain/res/mipmap-mdpi/ic_launcher_round.png b/...ain/res/mipmap-mdpi/ic_launcher_round.png → ...ain/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png b/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/...in/res/mipmap-xhdpi/ic_launcher_round.png → ...in/res/mipmap-xhdpi/ic_launcher_round.png b/...in/res/mipmap-xhdpi/ic_launcher_round.png → ...in/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png b/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/...n/res/mipmap-xxhdpi/ic_launcher_round.png → ...n/res/mipmap-xxhdpi/ic_launcher_round.png b/...n/res/mipmap-xxhdpi/ic_launcher_round.png → ...n/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/...c/main/res/mipmap-xxxhdpi/ic_launcher.png → ...c/main/res/mipmap-xxxhdpi/ic_launcher.png b/...c/main/res/mipmap-xxxhdpi/ic_launcher.png → ...c/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/.../res/mipmap-xxxhdpi/ic_launcher_round.png → .../res/mipmap-xxxhdpi/ic_launcher_round.png b/.../res/mipmap-xxxhdpi/ic_launcher_round.png → .../res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/sentry-sample/src/main/res/values/colors.xml → ...es-android/src/main/res/values/colors.xml b/sentry-sample/src/main/res/values/colors.xml → ...es-android/src/main/res/values/colors.xml
diff --git a/...ry-sample/src/main/res/values/strings.xml → ...s-android/src/main/res/values/strings.xml b/...ry-sample/src/main/res/values/strings.xml → ...s-android/src/main/res/values/strings.xml
diff --git a/sentry-sample/src/main/res/values/styles.xml → ...es-android/src/main/res/values/styles.xml b/sentry-sample/src/main/res/values/styles.xml → ...es-android/src/main/res/values/styles.xml
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -5,5 +5,5 @@ include("sentry-android",
         "sentry-android-ndk",
         "sentry-android-core",
         "sentry-core",
-        "sentry-sample",
+        "sentry-samples:sentry-samples-android",
         "sentry-android-timber")