Upgrade the example to Gradle 4.2 and Android plugin 2.3.3 #329
Conversation
Along with the necessary build system adjustments.
Do not check for the NDK during Gradle configurion phase, otherwise a simple "gradle tasks" would fail if no NDK is configured. Do the checks later when the ndkBuild task is actually executed.
|
Also, do not check for the NDK during Gradle configurion phase, otherwise a simple "gradle tasks" would fail if no NDK is configured. Do the checks later when the ndkBuild task is actually executed. |
|
Leaving this to @xianwen to review and merge, but my high-level take is that since this is for the sample app, the risk of any compatibility-breakage is minimal. So long as this works, and depends on GA versions of tools all Android devs are likely to have (i.e. not beta/preview versions) it should be fine. |
|
@sschuberth looks like our CLA-bot is broken, but it looks like we don't have a record of you signing the Dropbox CLA. Can you please sign it online here? https://opensource.dropbox.com/cla/ |
|
@artwyman That link seems to be dead. (Which might be the reason your CLA bot does not work?) |
|
Link seems to work for me right now, so maybe there was a temporary issue? Try again, please. |
|
Still dead for me: |
|
Nevermind, seems to be an intranet issue. |
|
Sadly some companies block Dropbox for security reasons (misguided ones if you ask me :). |
|
I first need to get the CLA reviewed, which will take some more time, I'm sorry. |
|
@artwyman I've signed the CLA now! |
|
Confirmed the CLA, thanks! @xianwen can take it from here. |
|
Any update @xianwen? |
|
Sorry for the delay, I'll take a look at it today, and get back to you once I finished the review. |
| @@ -1,25 +1,43 @@ | |||
| #!/usr/bin/env bash | |||
| #!/usr/bin/env sh | |||
There was a problem hiding this comment.
Please note that this file is automatically created by the Gradle wrapper task. As to why the Gradle devs decided to go for sh, I guess that's for better portability across platforms.
|
|
||
| :4NT_args | ||
| @rem Get arguments from the 4NT Shell from JP Software | ||
| set CMD_LINE_ARGS=%$ |
There was a problem hiding this comment.
Please see my comment above, this file is also auto-generated by the wrapper task and thus comes straight from Gradle. Anyway, see gradle/gradle#657 for the details.
There was a problem hiding this comment.
Oops, I just removed my comments since I'v figured out that these 2 files are auto-generated.
|
LGTM, |
* example: Guard against ndkDir being null at configuration time This is a follow-up to PR #329. * example: Upgrade to Android Gradle plugin 3.0.1 Each version of the Android Gradle Plugin now has a default version of the build tools. The "compile" configuration was renamed to "implementation". * example: Upgrade to Gradle 4.4.1
* upstream/master: (54 commits) Upgrade example build (dropbox#339) Separate `flags` to `enum_flags.djinni` (dropbox#346) Add a script to build static fat binary lib. (dropbox#341) Upgrade the example to Gradle 4.2 and Android plugin 2.3.3 (dropbox#329) Android parcelable support (dropbox#308) Add assembly to produce standalone jar. (dropbox#324) New "flags" archetype for enums oriented towards bitwise flags (dropbox#323) Add Xianwen to contacts Fix CFStringEncoding/NSStringEncoding confusion Added missing std:: in platform_threads_impl (dropbox#321) Avoid unused variable warning when compiling djinni_support.cpp (dropbox#319) [Android] Fix Djinni initialization crash in multi shared library case (dropbox#310) Fix rsync commands to not update timestamps on unchanged contents Swap the README.md change for a CONTRIBUTORS file for attribution. Renaming "temp" to "proxy_handle" to make more readable. Adding comment to warn of the potential segfault in gcc. Making three changes to fix compilation in our environment. Make Swift code more idiomatic move CMakeLists.txt file to root directory and rename target name to djinni_support_lib revert unintended generator change ... # Conflicts: # example/generated-src/objc/TXSTextboxListener+Private.mm # example/objc/TextSort.xcodeproj/project.pbxproj # example/objc/TextSort.xcodeproj/xcshareddata/xcschemes/TextSort.xcscheme # src/source/ObjcppGenerator.scala # src/source/parser.scala # test-suite/djinni/common.djinni # test-suite/generated-src/inFileList.txt # test-suite/generated-src/objc/DBClientInterface+Private.mm # test-suite/generated-src/objc/DBEnumUsageInterface+Private.mm # test-suite/generated-src/objc/DBExternInterface2+Private.mm # test-suite/generated-src/objc/DBFirstListener+Private.mm # test-suite/generated-src/objc/DBObjcOnlyListener+Private.mm # test-suite/generated-src/objc/DBSecondListener+Private.mm # test-suite/generated-src/objc/DBUserToken+Private.mm # test-suite/generated-src/objc/DBUsesSingleLanguageListeners+Private.mm # test-suite/generated-src/outFileList.txt # test-suite/handwritten-src/java/com/dropbox/djinni/test/AllTests.java # test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
* Upgrade the example to Gradle 4.2 and Android plugin 2.3.3 Along with the necessary build system adjustments. * Move the NDK checks to Gradle execution phase Do not check for the NDK during Gradle configurion phase, otherwise a simple "gradle tasks" would fail if no NDK is configured. Do the checks later when the ndkBuild task is actually executed.
* example: Guard against ndkDir being null at configuration time This is a follow-up to PR dropbox#329. * example: Upgrade to Android Gradle plugin 3.0.1 Each version of the Android Gradle Plugin now has a default version of the build tools. The "compile" configuration was renamed to "implementation". * example: Upgrade to Gradle 4.4.1
Along with the necessary build system adjustments.