diff options
author | Park Dong-Ha <luncliff@gmail.com> | 2018-11-02 16:54:00 +0000 |
---|---|---|
committer | Victor Zverovich <victor.zverovich@gmail.com> | 2018-11-05 17:31:09 -0800 |
commit | d286c9775388242b11fec92284c82c0b32bb037c (patch) | |
tree | 3933b2c217412fa579b8d457fa7722eef441e25d /support | |
parent | d951f6dfe7ae7f4314d3a9d3e247bd0458cb5d08 (diff) | |
download | fmtlib-d286c9775388242b11fec92284c82c0b32bb037c.tar.gz |
Update for Gradle build
Recovered Gradle build with latest release (ver. 4.10.2)
TravisCI
- Changed several apt configurations & build steps for Android
AndroidManifest:
- package name: fmt -> org.fmtlib
Gradle:
- Plugin version 3.1.3. Requires Gradle 4.4+
- Removed `x86` (duplicated with `x86_64`)
- `-std=c++17`. Latest NDK(clang7) should support this
- Missing `repositories` configuration
For some reason, the `repositories` config affects to the error:
"Could not find com.android.tools.lint:lint-gradle:26.1.3."
Diffstat (limited to 'support')
-rw-r--r-- | support/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | support/build.gradle | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/support/AndroidManifest.xml b/support/AndroidManifest.xml index 29fb0789..da9f5051 100644 --- a/support/AndroidManifest.xml +++ b/support/AndroidManifest.xml @@ -1 +1 @@ -<manifest package="fmt" />
\ No newline at end of file +<manifest package="org.fmtlib" /> diff --git a/support/build.gradle b/support/build.gradle index 1dd64391..d0f0db3c 100644 --- a/support/build.gradle +++ b/support/build.gradle @@ -4,12 +4,17 @@ buildscript { google() jcenter() } - dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + // Requires Gradle 4.4+ + // https://developer.android.com/studio/releases/gradle-plugin + classpath 'com.android.tools.build:gradle:3.1.3' } } - +repositories { + google() + jcenter() +} + // Output: Shared library (.so) for Android apply plugin: 'com.android.library' @@ -24,12 +29,9 @@ android { splits { abi { enable true - // Be general, as much as possible ... - // universalApk true - // Specify platforms for Application reset() - include "x86", "x86_64", "armeabi-v7a", "arm64-v8a" + include "arm64-v8a", "armeabi-v7a", "x86_64" } } @@ -46,7 +48,7 @@ android { arguments "-DBUILD_SHARED_LIBS=true" // Build shared object arguments "-DFMT_TEST=false" // Skip test arguments "-DFMT_DOC=false" // Skip document - cppFlags "-std=c++14" + cppFlags "-std=c++17" } } println("Gradle CMake Plugin: ") |