Skip to content

Restore AndroidHarness activity, deprecate it #2774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
8Keep wants to merge 4 commits into
base: master
Choose a base branch
from
+491 −8
Draft

Restore AndroidHarness activity, deprecate it #2774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c04e120
Restore deprecated AndroidHarness
8Keep May 11, 2026
80db3e3
Make AndroidHarness fragment recreateable
8Keep May 15, 2026
37d0f8d
Restore AndroidHarness compatibility hooks
8Keep May 15, 2026
9b86ba6
Fix AndroidX stubs for merged Javadoc
8Keep May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ tasks.register('mergedJavadoc', Javadoc) {

options.overview = file("javadoc-overview.html")
source = mergedJavadocSubprojects.collect { project(it).sourceSets.main.allJava }
source += fileTree("jme3-android/src/androidx-stubs/java")
classpath = files(mergedJavadocSubprojects.collect { project(it).sourceSets.main.compileClasspath })
}

Expand Down
11 changes: 3 additions & 8 deletions jme3-android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
sourceSets {
main {
java {
srcDir 'src/androidx-stubs/java'
}
}
}

dependencies {
//added annotations used by JmeSurfaceView.
compileOnly libs.androidx.annotation
Expand All @@ -17,6 +9,8 @@ dependencies {
compileJava {
// The Android-Native Project requires the jni headers to be generated, so we do that here
options.compilerArgs += ["-h", "${project.rootDir}/jme3-android-native/src/native/headers"]
options.sourcepath = files("src/androidx-stubs/java")
options.compilerArgs += ["-implicit:none"]
}

tasks.withType(Jar).configureEach {
Expand All @@ -28,5 +22,6 @@ tasks.named('sourcesJar') {
}

javadoc {
source += fileTree("src/androidx-stubs/java")
exclude('androidx/**')
}
Loading
Loading