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."
This commit is contained in:
Park Dong-Ha 2018-11-02 16:54:00 +00:00 committed by Victor Zverovich
parent d951f6dfe7
commit d286c97753
3 changed files with 13 additions and 11 deletions

View File

@ -83,7 +83,7 @@ matrix:
- g++-4.4 - g++-4.4
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
# Android # Android
- language: android - language: android
addons: addons:
apt: apt:
@ -115,7 +115,7 @@ matrix:
before_script: before_script:
- pushd ./support - pushd ./support
script: script:
- bash $GRADLE clean assemble - bash ../$GRADLE clean assemble
after_success: after_success:
- popd; - popd;
- tree ./libs - tree ./libs

View File

@ -1 +1 @@
<manifest package="fmt" /> <manifest package="org.fmtlib" />

View File

@ -4,12 +4,17 @@ buildscript {
google() google()
jcenter() jcenter()
} }
dependencies { 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 // Output: Shared library (.so) for Android
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
@ -24,12 +29,9 @@ android {
splits { splits {
abi { abi {
enable true enable true
// Be general, as much as possible ...
// universalApk true
// Specify platforms for Application // Specify platforms for Application
reset() 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 "-DBUILD_SHARED_LIBS=true" // Build shared object
arguments "-DFMT_TEST=false" // Skip test arguments "-DFMT_TEST=false" // Skip test
arguments "-DFMT_DOC=false" // Skip document arguments "-DFMT_DOC=false" // Skip document
cppFlags "-std=c++14" cppFlags "-std=c++17"
} }
} }
println("Gradle CMake Plugin: ") println("Gradle CMake Plugin: ")