diff options
author | fhuya <fhuya@google.com> | 2020-03-26 07:34:07 -0700 |
---|---|---|
committer | fhuya <fhuya@google.com> | 2020-03-26 07:34:07 -0700 |
commit | 6837796a9d7acd3a5ea7ef241a23fd393c3a6609 (patch) | |
tree | a90acbe1a388d1aeec0e70836225890eb0894577 | |
parent | f1a5737ecff60476da0a797c8063b44e4f2659b1 (diff) | |
download | godot-android-samples-6837796a9d7acd3a5ea7ef241a23fd393c3a6609.tar.gz godot-android-samples-6837796a9d7acd3a5ea7ef241a23fd393c3a6609.tar.bz2 godot-android-samples-6837796a9d7acd3a5ea7ef241a23fd393c3a6609.zip |
Update repository structure: make each sample project (e.g: `hello_world`) a subproject in the `Godot-Android-Plugins` project.
-rw-r--r-- | .gitignore | 90 | ||||
-rw-r--r-- | build.gradle | 29 | ||||
-rw-r--r-- | gradle.properties (renamed from hello_world/gradle.properties) | 0 | ||||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.jar (renamed from hello_world/gradle/wrapper/gradle-wrapper.jar) | bin | 54329 -> 54329 bytes | |||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.properties (renamed from hello_world/gradle/wrapper/gradle-wrapper.properties) | 0 | ||||
-rwxr-xr-x | gradlew (renamed from hello_world/gradlew) | 0 | ||||
-rw-r--r-- | gradlew.bat (renamed from hello_world/gradlew.bat) | 0 | ||||
-rw-r--r-- | hello_world/.gitignore | 13 | ||||
-rw-r--r-- | hello_world/build.gradle | 47 | ||||
-rw-r--r-- | hello_world/demo/.gitignore | 2 | ||||
-rw-r--r-- | hello_world/plugin/.gitignore | 1 | ||||
-rw-r--r-- | hello_world/plugin/build.gradle | 34 | ||||
-rw-r--r-- | hello_world/settings.gradle | 2 | ||||
-rw-r--r-- | hello_world/src/main/AndroidManifest.xml (renamed from hello_world/plugin/src/main/AndroidManifest.xml) | 0 | ||||
-rw-r--r-- | hello_world/src/main/java/fhuyakou/godot/plugin/android/helloworld/HelloWorldPlugin.java (renamed from hello_world/plugin/src/main/java/fhuyakou/godot/plugin/android/helloworld/HelloWorldPlugin.java) | 0 | ||||
-rw-r--r-- | hello_world/src/main/res/layout/hello_world_view.xml (renamed from hello_world/plugin/src/main/res/layout/hello_world_view.xml) | 0 | ||||
-rw-r--r-- | hello_world/src/main/res/values/strings.xml (renamed from hello_world/plugin/src/main/res/values/strings.xml) | 0 | ||||
-rw-r--r-- | libs/godot-lib.release.aar (renamed from hello_world/plugin/libs/godot-lib.release.aar) | bin | 9149797 -> 9149797 bytes | |||
-rw-r--r-- | settings.gradle | 3 |
19 files changed, 67 insertions, 154 deletions
@@ -1,85 +1,9 @@ -# Built application files -*.apk -*.aar -*.ap_ -*.aab - -# Files for the ART/Dalvik VM -*.dex - -# Java class files -*.class - -# Generated files -bin/ -gen/ -out/ -# Uncomment the following line in case you need and you don't have the release build type files in your app -# release/ - -# Gradle files -.gradle/ -build/ - -# Local configuration file (sdk path, etc) -local.properties - -# Proguard folder generated by Eclipse -proguard/ - -# Log Files -*.log - -# Android Studio Navigation editor temp files -.navigation/ - -# Android Studio captures folder -captures/ - -# IntelliJ *.iml -.idea/workspace.xml -.idea/tasks.xml -.idea/gradle.xml -.idea/assetWizardSettings.xml -.idea/dictionaries -.idea/libraries -# Android Studio 3 in .gitignore file. -.idea/caches -.idea/modules.xml -# Comment next line if keeping position of elements in Navigation Editor is relevant for you -.idea/navEditor.xml - -# Keystore files -# Uncomment the following lines if you do not want to check your keystore files in. -#*.jks -#*.keystore - -# External native build folder generated in Android Studio 2.2 and later +.gradle +/local.properties +.idea +.DS_Store +/build +/captures .externalNativeBuild -.cxx/ - -# Google Services (e.g. APIs or Firebase) -# google-services.json - -# Freeline -freeline.py -freeline/ -freeline_project_description.json - -# fastlane -fastlane/report.xml -fastlane/Preview.html -fastlane/screenshots -fastlane/test_output -fastlane/readme.md - -# Version control -vcs.xml - -# lint -lint/intermediates/ -lint/generated/ -lint/outputs/ -lint/tmp/ -# lint/reports/ +.cxx diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..9494940 --- /dev/null +++ b/build.gradle @@ -0,0 +1,29 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + + repositories { + google() + jcenter() + + } + dependencies { + classpath 'com.android.tools.build:gradle:3.6.1' + + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/hello_world/gradle.properties b/gradle.properties index 82618ce..82618ce 100644 --- a/hello_world/gradle.properties +++ b/gradle.properties diff --git a/hello_world/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex f6b961f..f6b961f 100644 --- a/hello_world/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/hello_world/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3a02130..3a02130 100644 --- a/hello_world/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties diff --git a/hello_world/gradlew b/gradlew index cccdd3d..cccdd3d 100755 --- a/hello_world/gradlew +++ b/gradlew diff --git a/hello_world/gradlew.bat b/gradlew.bat index f955316..f955316 100644 --- a/hello_world/gradlew.bat +++ b/gradlew.bat diff --git a/hello_world/.gitignore b/hello_world/.gitignore index 603b140..796b96d 100644 --- a/hello_world/.gitignore +++ b/hello_world/.gitignore @@ -1,14 +1 @@ -*.iml -.gradle -/local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -.DS_Store /build -/captures -.externalNativeBuild -.cxx diff --git a/hello_world/build.gradle b/hello_world/build.gradle index f07e19a..71da365 100644 --- a/hello_world/build.gradle +++ b/hello_world/build.gradle @@ -1,29 +1,34 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. +apply plugin: 'com.android.library' -buildscript { - - repositories { - google() - jcenter() - - } - dependencies { - classpath 'com.android.tools.build:gradle:3.6.0' - +android { + compileSdkVersion 29 + buildToolsVersion "29.0.1" - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + defaultConfig { + minSdkVersion 18 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" } -} -allprojects { - repositories { - google() - jcenter() - + // Used to customize the name of generated AAR file. + libraryVariants.all { variant -> + variant.outputs.all { output -> + output.outputFileName = "HelloWorld.${variant.name}.aar" + } } + } -task clean(type: Delete) { - delete rootProject.buildDir +dependencies { + /* + Used to provide dependency on the Godot Android library. A version of that + library will be made available for each stable release of Godot. + + `compileOnly` is used instead of `implementation` to ensure that the + godot library is not bundled with the generated plugin AAR file. This is + necessary since the Godot editor will also provide a version of the godot + library when building the final binary. + */ + compileOnly fileTree(dir: '../libs', include: ['godot-lib*.aar']) } diff --git a/hello_world/demo/.gitignore b/hello_world/demo/.gitignore new file mode 100644 index 0000000..b405634 --- /dev/null +++ b/hello_world/demo/.gitignore @@ -0,0 +1,2 @@ +*.import +/android/ diff --git a/hello_world/plugin/.gitignore b/hello_world/plugin/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/hello_world/plugin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/hello_world/plugin/build.gradle b/hello_world/plugin/build.gradle deleted file mode 100644 index 2d1e7fa..0000000 --- a/hello_world/plugin/build.gradle +++ /dev/null @@ -1,34 +0,0 @@ -apply plugin: 'com.android.library' - -android { - compileSdkVersion 29 - buildToolsVersion "29.0.1" - - defaultConfig { - minSdkVersion 18 - targetSdkVersion 29 - versionCode 1 - versionName "1.0" - } - - // Used to customize the name of generated AAR file. - libraryVariants.all { variant -> - variant.outputs.all { output -> - output.outputFileName = "HelloWorld.${variant.name}.aar" - } - } - -} - -dependencies { - /* - Used to provide dependency on the Godot Android library. A version of that - library will be made available for each stable release of Godot. - - `compileOnly` is used instead of `implementation` to ensure that the - godot library is not bundled with the generated plugin AAR file. This is - necessary since the Godot editor will also provide a version of the godot - library when building the final binary. - */ - compileOnly fileTree(dir: 'libs', include: ['godot-lib*.aar']) -} diff --git a/hello_world/settings.gradle b/hello_world/settings.gradle deleted file mode 100644 index 475b38d..0000000 --- a/hello_world/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name='HelloWorldPlugin' -include ':plugin' diff --git a/hello_world/plugin/src/main/AndroidManifest.xml b/hello_world/src/main/AndroidManifest.xml index 8bb5fa4..8bb5fa4 100644 --- a/hello_world/plugin/src/main/AndroidManifest.xml +++ b/hello_world/src/main/AndroidManifest.xml diff --git a/hello_world/plugin/src/main/java/fhuyakou/godot/plugin/android/helloworld/HelloWorldPlugin.java b/hello_world/src/main/java/fhuyakou/godot/plugin/android/helloworld/HelloWorldPlugin.java index fe0a319..fe0a319 100644 --- a/hello_world/plugin/src/main/java/fhuyakou/godot/plugin/android/helloworld/HelloWorldPlugin.java +++ b/hello_world/src/main/java/fhuyakou/godot/plugin/android/helloworld/HelloWorldPlugin.java diff --git a/hello_world/plugin/src/main/res/layout/hello_world_view.xml b/hello_world/src/main/res/layout/hello_world_view.xml index e831d87..e831d87 100644 --- a/hello_world/plugin/src/main/res/layout/hello_world_view.xml +++ b/hello_world/src/main/res/layout/hello_world_view.xml diff --git a/hello_world/plugin/src/main/res/values/strings.xml b/hello_world/src/main/res/values/strings.xml index d2cf3ac..d2cf3ac 100644 --- a/hello_world/plugin/src/main/res/values/strings.xml +++ b/hello_world/src/main/res/values/strings.xml diff --git a/hello_world/plugin/libs/godot-lib.release.aar b/libs/godot-lib.release.aar Binary files differindex 4762e4f..4762e4f 100644 --- a/hello_world/plugin/libs/godot-lib.release.aar +++ b/libs/godot-lib.release.aar diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..212b118 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,3 @@ +rootProject.name='Godot Android Plugins' + +include ':hello_world' |