Create tests folder, invert Gradle dependency

deepmedia · natario1 · Aug 25, 2024 · Aug 25, 2024 · Aug 25, 2024 · Aug 25, 2024
commit ed08094e46acabd97598e82aff49ba6efb17f312
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,4 +17,6 @@ jobs:
           cache: gradle
       - uses: gradle/actions/wrapper-validation@v4
       - name: Check local deployment
-        run: ./gradlew build deployLocal
+        run: ./gradlew build deployLocal
+      - name: Check sample app
+        run: cd tests && ../gradlew sample:assembleDebug
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 *.iml
 .gradle
-/local.properties
+**/local.properties
 /.idea/
 .DS_Store
 /build

diff --git a/grease/build.gradle.kts b/grease/build.gradle.kts
@@ -35,4 +35,8 @@ deployer {
         scm.fromGithub("deepmedia", "Grease")
         developer("natario1", "[email protected]", "DeepMedia", "https://deepmedia.io")
     }
+
+    localSpec {
+        directory = layout.buildDirectory.dir("inspect")
+    }
 }
diff --git a/grease/src/main/kotlin/io/deepmedia/tools/grease/task.kt b/grease/src/main/kotlin/io/deepmedia/tools/grease/task.kt
@@ -42,6 +42,7 @@ internal fun <T : Task> TaskContainer.locateOrRegisterTask(
     return locateTask(name, type) ?: registerTask(name, type, body = body)
 }
 
+@Suppress("UNCHECKED_CAST")
 internal fun TaskContainer.locateOrRegisterTask(name: String, body: Task.() -> (Unit)): TaskProvider<Task> {
     return (locateTask(name, DefaultTask::class.java) ?: registerTask(name, DefaultTask::class.java, body = body)) as TaskProvider<Task>
 }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,4 @@
 pluginManagement {
-    includeBuild("./grease")
     repositories {
         google()
         gradlePluginPortal()
@@ -14,8 +13,11 @@ dependencyResolutionManagement {
         gradlePluginPortal()
         mavenCentral()
     }
+    versionCatalogs {
+        create("libs")
+    }
 }
 
-rootProject.name = "grease"
+rootProject.name = "Grease"
 
-include(":sample")
+include(":grease")
diff --git a/tests/gradle.properties b/tests/gradle.properties
@@ -0,0 +1,19 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
diff --git a/sample/.gitignore → tests/sample/.gitignore b/sample/.gitignore → tests/sample/.gitignore
diff --git a/sample/build.gradle.kts → tests/sample/build.gradle.kts b/sample/build.gradle.kts → tests/sample/build.gradle.kts
diff --git a/sample/consumer-rules.pro → tests/sample/consumer-rules.pro b/sample/consumer-rules.pro → tests/sample/consumer-rules.pro
diff --git a/sample/proguard-rules.pro → tests/sample/proguard-rules.pro b/sample/proguard-rules.pro → tests/sample/proguard-rules.pro
diff --git a/sample/src/main/AndroidManifest.xml → tests/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml → tests/sample/src/main/AndroidManifest.xml
diff --git a/sample/src/main/CMakeLists.txt → tests/sample/src/main/CMakeLists.txt b/sample/src/main/CMakeLists.txt → tests/sample/src/main/CMakeLists.txt
diff --git a/sample/src/main/assets/sample_asset_1 → tests/sample/src/main/assets/sample_asset_1 b/sample/src/main/assets/sample_asset_1 → tests/sample/src/main/assets/sample_asset_1
diff --git a/sample/src/main/assets/sample_asset_2.png → ...sample/src/main/assets/sample_asset_2.png b/sample/src/main/assets/sample_asset_2.png → ...sample/src/main/assets/sample_asset_2.png
diff --git a/sample/src/main/assets/sample_asset_3.log → ...sample/src/main/assets/sample_asset_3.log b/sample/src/main/assets/sample_asset_3.log → ...sample/src/main/assets/sample_asset_3.log
diff --git a/sample/src/main/cc/grease-api.cc → tests/sample/src/main/cc/grease-api.cc b/sample/src/main/cc/grease-api.cc → tests/sample/src/main/cc/grease-api.cc
diff --git a/...a/tools/grease/sample/SampleActivity.java → ...a/tools/grease/sample/SampleActivity.java b/...a/tools/grease/sample/SampleActivity.java → ...a/tools/grease/sample/SampleActivity.java
diff --git a/...ools/grease/sample/SampleApplication.java → ...ools/grease/sample/SampleApplication.java b/...ools/grease/sample/SampleApplication.java → ...ools/grease/sample/SampleApplication.java
diff --git a/...media/tools/grease/sample/SampleView.java → ...media/tools/grease/sample/SampleView.java b/...media/tools/grease/sample/SampleView.java → ...media/tools/grease/sample/SampleView.java
diff --git a/sample/src/main/res/layout/sample_layout.xml → ...ple/src/main/res/layout/sample_layout.xml b/sample/src/main/res/layout/sample_layout.xml → ...ple/src/main/res/layout/sample_layout.xml
diff --git a/sample/src/main/res/values/sample_ids.xml → ...sample/src/main/res/values/sample_ids.xml b/sample/src/main/res/values/sample_ids.xml → ...sample/src/main/res/values/sample_ids.xml
diff --git a/grease/settings.gradle.kts → tests/settings.gradle.kts b/grease/settings.gradle.kts → tests/settings.gradle.kts
@@ -1,4 +1,5 @@
 pluginManagement {
+    includeBuild("..")
     repositories {
         google()
         gradlePluginPortal()
@@ -20,4 +21,6 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "grease"
+rootProject.name = "Grease"
+
+include(":sample")