Skip to content

Commit 5a762f0

Browse files
committed
Move all gradle files into folder app
Decouple java and native projects
1 parent 5dd7a7d commit 5a762f0

24 files changed

Lines changed: 54 additions & 52 deletions

.github/workflows/build.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ on:
66
paths:
77
- "app/**"
88
- "native/**"
9-
- "buildSrc/**"
109
- "build.py"
11-
- "gradle.properties"
12-
- "gradle/libs.versions.toml"
1310
- ".github/workflows/build.yml"
1411
pull_request:
1512
branches: [master]
@@ -39,7 +36,7 @@ jobs:
3936
run: ./build.py -v all
4037

4138
- name: Stop gradle daemon
42-
run: ./gradlew --stop
39+
run: ./app/gradlew --stop
4340

4441
- name: Upload build artifact
4542
uses: actions/upload-artifact@v4
@@ -75,7 +72,7 @@ jobs:
7572
run: python build.py -v -c .github/ci.prop all
7673

7774
- name: Stop gradle daemon
78-
run: ./gradlew --stop
75+
run: ./app/gradlew --stop
7976

8077
avd-test:
8178
name: Test API ${{ matrix.version }} (x86_64)

.gitignore

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,10 @@ out
55
*.log
66
/config.prop
77
/notes.md
8-
/app/dict.txt
98

109
# Built binaries
1110
native/out
1211

13-
# Android Studio / Gradle
12+
# Android Studio
1413
*.iml
15-
.gradle
1614
.idea
17-
.kotlin
18-
/local.properties
19-
/build
20-
/captures

app/.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/dict.txt
2+
3+
# Gradle
4+
.gradle
5+
.kotlin
6+
/local.properties
7+
/build

app/apk/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ android {
3535
}
3636

3737
dependencies {
38-
implementation(project(":app:core"))
38+
implementation(project(":core"))
3939
coreLibraryDesugaring(libs.jdk.libs)
4040

4141
implementation(libs.indeterminate.checkbox)

app/build.gradle.kts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
tasks.register("clean") {
1+
plugins {
2+
id("MagiskPlugin")
3+
}
4+
5+
tasks.register("clean", Delete::class) {
6+
delete(rootProject.layout.buildDirectory)
7+
28
subprojects.forEach {
3-
dependsOn(":app:${it.name}:clean")
9+
dependsOn(":${it.name}:clean")
410
}
511
}

buildSrc/src/main/java/DesugarClassVisitorFactory.kt renamed to app/buildSrc/src/main/java/DesugarClassVisitorFactory.kt

File renamed without changes.

0 commit comments

Comments
 (0)