Skip to content

Commit d1ebbd3

Browse files
authored
Update tools and libraries (#14)
* Migration library to use android ndk CMake build system * Migration library to use android ndk CMake build system - Renaming 'native' methods * Try to update to latest leveldb and new build tools * Update android build tools and gradle Update min version to 14 Update target version to 28 Update leveldb to use source from master Update CMakeLists to use CMakeLists of leveldb * Delete .idea folder from git * Delete empty example project * Update travis config and .cc file to fix some warnings * Update .travis.yml * Update .travis.yml * Update .travis.yml * Update Unit test and test libraries * Update travis.yml * Update travis.yml * Update .travis.yml * Update gradle to use cmake version 3.10.2 * Update .travis.yml * Update .travis.yml * Update README.md * Update project build.gradle * Update README.md * Fix AndroidLogger Move utility methods and classes to separate file
1 parent 97df68d commit d1ebbd3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1021
-1299
lines changed

.gitignore

+40-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,44 @@ test
55
target
66
log
77

8-
/.idea/workspace.xml
8+
/.idea
99
/.idea/tasks.xml
10-
/.idea/libraries
10+
# built application files
11+
*.apk
12+
*.ap_
13+
14+
# files for the dex VM
15+
*.dex
16+
17+
# Java class files
18+
*.class
19+
20+
# built native files (uncomment if you build your own)
21+
# *.o
22+
# *.so
23+
24+
# generated files
25+
bin/
26+
gen/
27+
28+
# Ignore gradle files
29+
# Local configuration file (sdk path, etc)
30+
# Proguard folder generated by Eclipse
31+
proguard/
32+
33+
# Eclipse Metadata
34+
.metadata/
35+
36+
# Mac OS X clutter
37+
*.DS_Store
38+
39+
# Windows clutter
40+
Thumbs.db
41+
42+
# Intellij IDEA (see https://intellij-support.jetbrains.com/entries/23393067)
43+
*.iml
44+
/gradle
45+
leveldb/.externalNativeBuild/
46+
.idea/runConfigurations.xml
47+
/gradlew
48+
gradlew.bat

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "leveldb/src/main/jni-prebuild/leveldb"]
2-
path = leveldb/src/main/jni-prebuild/leveldb
2+
path = leveldb/src/main/cpp/leveldb
33
url = https://github.com/google/leveldb.git

.idea/.name

-1
This file was deleted.

.idea/codeStyleSettings.xml

-20
This file was deleted.

.idea/compiler.xml

-23
This file was deleted.

.idea/copyright/BSD_3_Clause.xml

-9
This file was deleted.

.idea/copyright/profiles_settings.xml

-10
This file was deleted.

.idea/encodings.xml

-5
This file was deleted.

.idea/gradle.xml

-18
This file was deleted.

.idea/misc.xml

-10
This file was deleted.

.idea/modules.xml

-10
This file was deleted.

.idea/scopes/scope_settings.xml

-5
This file was deleted.

.idea/uiDesigner.xml

-125
This file was deleted.

.idea/vcs.xml

-7
This file was deleted.

.travis.yml

+36-14
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,55 @@
11
language: android
2-
3-
jdk:
4-
- oraclejdk8
2+
dist: trusty
3+
sudo: required
4+
jdk: oraclejdk8
55

66
env:
7-
matrix:
8-
- ANDROID_ABI=armeabi-v7a
7+
global:
8+
- ANDROID_API_LEVEL=28
9+
- ANDROID_BUILD_TOOLS_VERSION=28.0.3
10+
- ANDROID_ABI=armeabi-v7a
911

1012
android:
1113
components:
1214
- tools
1315
- platform-tools
14-
- build-tools-23.0.3
16+
- tools
17+
- build-tools-25.0.2
18+
- extra-google-google_play_services
1519
- extra-google-m2repository
1620
- extra-android-m2repository
1721
- android-24
18-
- sys-img-armeabi-v7a-android-24
22+
- android-22
23+
- sys-img-armeabi-v7a-android-22
24+
licenses:
25+
- 'android-sdk-preview-license-52d11cd2'
26+
- 'android-sdk-license-.+'
27+
- 'google-gdk-license-.+'
1928

2029
before_install:
21-
- jdk_switcher use oraclejdk8
22-
- java -version
23-
- android list targets
24-
- echo no | android create avd --force -n test -t android-24 --abi $ANDROID_ABI
30+
- touch $HOME/.android/repositories.cfg
31+
- yes | sdkmanager "platforms;android-28"
32+
- yes | sdkmanager "build-tools;28.0.3"
33+
- echo no | android create avd --force -n test -t android-22 --abi $ANDROID_ABI -c 32M
2534
- emulator -avd test -no-skin -no-audio -no-window &
26-
- wget https://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip
27-
- unzip -q android-ndk-r13-linux-x86_64.zip
28-
- export PATH=$PATH:$PWD/android-ndk-r13
35+
36+
install:
37+
- echo y | sdkmanager "ndk-bundle"
38+
- echo y | sdkmanager --channel=3 --channel=1 "cmake;3.10.2.4988404"
39+
- echo y | sdkmanager "lldb;3.1"
40+
41+
before_cache:
42+
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
43+
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
44+
45+
cache:
46+
directories:
47+
- $HOME/.gradle/caches/
48+
- $HOME/.gradle/wrapper/
49+
- $HOME/.android/build-cache
2950

3051
before_script:
52+
- chmod +x gradlew
3153
- ./ci/wait_for_emulator.sh
3254

3355
script: ./gradlew connectedCheck

0 commit comments

Comments
 (0)