love-android as a library #290
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| [submodule "library/src/main/cpp/love"] | ||
| path = library/src/main/cpp/love | ||
| url = https://github.com/love2d/love.git | ||
| branch = main | ||
| [submodule "library/src/main/cpp/megasource"] | ||
| path = library/src/main/cpp/megasource | ||
| url = https://github.com/love2d/megasource.git | ||
| branch = main |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,11 @@ | ||
| About fork: | ||
| --------- | ||
| This is a fork of the original project, it moves the app into a library and publishes it into an aar for easy app integration. | ||
|
|
||
| https://jitpack.io/#eltonkola/love-android/Tag | ||
|
|
||
| if there is interest we can clean it and try to merge into the main project | ||
|
|
||
|
Comment on lines
+1
to
+8
There was a problem hiding this comment. Please remove this line. Thanks. |
||
| Android Port of LÖVE, an awesome 2D game engine for Lua (http://love2d.org) | ||
| Copyright (c) 2006-2024 LOVE Development Team | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,8 @@ buildscript { | |
| } | ||
| dependencies { | ||
| classpath 'com.android.tools.build:gradle:8.7.0' | ||
| classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21' | ||
| classpath 'org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21' | ||
|
|
||
| // NOTE: Do not place your application dependencies here; they belong | ||
| // in the individual module build.gradle files | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,15 +1,17 @@ | ||||||
| import java.nio.charset.StandardCharsets // Keep if getAppName or other parts need it | ||||||
|
|
||||||
|
There was a problem hiding this comment. Redundant comment. Makes the commit noisy.
Suggested change
|
||||||
| plugins { | ||||||
| id 'com.android.library' | ||||||
| id 'maven-publish' // Keep: essential for maven publishing | ||||||
| } | ||||||
|
|
||||||
| android { | ||||||
| namespace "org.love2d.android" | ||||||
| ndkVersion '27.1.12297006' | ||||||
|
|
||||||
| defaultConfig { | ||||||
| // Use distinct properties for library versioning if they differ from app versions | ||||||
| // e.g., project.properties["lib.version_code"] | ||||||
| versionCode project.properties["app.version_code"].toInteger() | ||||||
| versionName project.properties["app.version_name"] | ||||||
| minSdk 23 | ||||||
|
|
@@ -19,21 +21,19 @@ android { | |||||
| externalNativeBuild { | ||||||
| cmake { | ||||||
| arguments "-DANDROID_STL=c++_shared", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=1" | ||||||
| targets "love_android", "OpenAL", "love" | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| ndk { | ||||||
| abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64' | ||||||
| debugSymbolLevel 'full' | ||||||
| } | ||||||
|
|
||||||
| // getAppName function and manifestPlaceholders: | ||||||
| // These seem more app-specific. If your library's manifest doesn't use these, | ||||||
| // they could be removed or adjusted for library context. | ||||||
| // For now, keeping them as they were in your file. | ||||||
| def getAppName = { | ||||||
| def nameArray = project.properties["app.name_byte_array"] | ||||||
| def name = project.properties["app.name"] | ||||||
|
|
@@ -54,55 +54,54 @@ android { | |||||
| } | ||||||
|
|
||||||
| manifestPlaceholders = [ | ||||||
| NAME:getAppName(), | ||||||
| ORIENTATION:project.properties["app.orientation"], | ||||||
| ] | ||||||
| } | ||||||
|
|
||||||
| // retrieveAll3pModules function: Keep as is if used by your sourceSets | ||||||
| def retrieveAll3pModules = { -> | ||||||
| def modules = [] | ||||||
| fileTree("src/main/cpp/lua-modules/").visit { FileVisitDetails details -> | ||||||
| if (details.isDirectory()) { | ||||||
| if (file(details.file.path + "/Android.mk").exists() || | ||||||
| file(details.file.path + "/CMakeLists.mk").exists()) { | ||||||
| def logger = project.getLogger() | ||||||
| logger.lifecycle("3rd-party module: " + details.file.path) | ||||||
| def javainfo = file(details.file.path + "/java.txt") | ||||||
| if (javainfo.exists()) { | ||||||
| def fstream = new FileInputStream(javainfo) | ||||||
| def infile = new BufferedReader(new InputStreamReader(fstream)) | ||||||
| def javapath = infile.readLine().replace("\\", "/") | ||||||
| def mpath = null | ||||||
| if (javapath[0] != '/') { | ||||||
| mpath = details.file.path + "/" + javapath | ||||||
| } else { | ||||||
| mpath = details.file.path + javapath | ||||||
| } | ||||||
| modules << mpath | ||||||
| logger.lifecycle("Registered path " + mpath) | ||||||
| infile.close() | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
| return modules | ||||||
| } | ||||||
|
|
||||||
| buildTypes { | ||||||
| release { | ||||||
| minifyEnabled false | ||||||
| // proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' // Usually not for libraries | ||||||
| } | ||||||
| // debug {} // Can add if needed | ||||||
| } | ||||||
|
|
||||||
| // buildFeatures - prefab was already there, keep it. | ||||||
| // viewBinding was duplicated, keep one. | ||||||
| buildFeatures { | ||||||
| prefab true | ||||||
| viewBinding true // If your library uses ViewBinding. | ||||||
| } | ||||||
|
|
||||||
| flavorDimensions = ['mode', 'recording'] | ||||||
|
|
@@ -130,7 +129,7 @@ android { | |||||
| srcDirs += retrieveAll3pModules() | ||||||
| } | ||||||
| } | ||||||
| normal { // This was for 'normal' flavor, keep if it has specific sources | ||||||
| java { | ||||||
| srcDir 'src/normal/java' | ||||||
| } | ||||||
|
|
@@ -141,31 +140,57 @@ android { | |||||
| sourceCompatibility JavaVersion.VERSION_1_8 | ||||||
| targetCompatibility JavaVersion.VERSION_1_8 | ||||||
| } | ||||||
|
|
||||||
| externalNativeBuild { | ||||||
| cmake { | ||||||
| path file('src/main/cpp/CMakeLists.txt') | ||||||
| version '3.21.0+' | ||||||
| } | ||||||
| } | ||||||
| packagingOptions { | ||||||
| jniLibs { | ||||||
| excludes += [ | ||||||
| 'lib/armeabi-v7a/libOpenSLES.so', | ||||||
| 'lib/arm64-v8a/libOpenSLES.so', | ||||||
| 'lib/x86/libOpenSLES.so', | ||||||
| 'lib/x86_64/libOpenSLES.so' | ||||||
| ] | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| // RECOMMENDED: Use AGP's built-in publishing DSL (for AGP 7.0+) | ||||||
| // This should be placed INSIDE the android {} block. | ||||||
| publishing { | ||||||
| singleVariant("normalRecordRelease") { | ||||||
| // This tells AGP to prepare the 'normalRecordRelease' variant for publishing. | ||||||
| // The maven-publish plugin will then pick this up. | ||||||
|
|
||||||
| // To include a sources JAR in the publication (highly recommended for libraries): | ||||||
| // withSourcesJar() | ||||||
|
|
||||||
| // To include a Javadoc JAR (optional): | ||||||
| // withJavadocJar() | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| } // End of android {} block | ||||||
|
|
||||||
|
|
||||||
| // REMOVE the old 'android.libraryVariants.all { ... }' publishing block. | ||||||
| // It conflicts with the android.publishing DSL and afterEvaluate. | ||||||
|
|
||||||
| // REMOVE the 'afterEvaluate { ... }' publishing block. | ||||||
| // The debug code was helpful but the publishing part conflicts. | ||||||
| // The android.publishing DSL is preferred. | ||||||
|
|
||||||
|
|
||||||
| // Define project.group and project.version for Maven publishing. | ||||||
| // These will be used by the publication created by android.publishing and maven-publish. | ||||||
| // Ensure these properties are defined (e.g., in gradle.properties or set sensible defaults). | ||||||
| // Use properties specific to the library's Maven coordinates if they differ from the app. | ||||||
| project.group = project.findProperty("LIB_GROUP_ID")?.toString() ?: "org.love2d.android.sdk" // Example: use a library-specific group | ||||||
| project.version = project.findProperty("LIB_VERSION_NAME")?.toString() ?: android.defaultConfig.versionName // Use library version | ||||||
|
|
||||||
|
|
||||||
| dependencies { | ||||||
| implementation 'androidx.appcompat:appcompat:1.7.0' | ||||||
|
|
@@ -178,7 +203,6 @@ dependencies { | |||||
| implementation 'com.google.oboe:oboe:1.9.3' | ||||||
| } | ||||||
|
|
||||||
| configurations.implementation { | ||||||
| exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8' | ||||||
| } | ||||||
File renamed without changes.
File renamed without changes.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any reason why we don't need to clone submodules? For someone who wants to compile from source quickly, they can just do:
Instead of having to manually re-clone the needed repository (megasource and main LOVE)