diff --git a/example_app/.idea/misc.xml b/example_app/.idea/misc.xml index 51fa3e5b2..b3ebd6678 100644 --- a/example_app/.idea/misc.xml +++ b/example_app/.idea/misc.xml @@ -5,7 +5,7 @@ - + diff --git a/example_app/app/build.gradle b/example_app/app/build.gradle index b8a103cd2..d4a8417bc 100644 --- a/example_app/app/build.gradle +++ b/example_app/app/build.gradle @@ -74,7 +74,11 @@ android { ] } } - + compileOptions { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + } + buildToolsVersion = '29.0.3' } @@ -85,7 +89,7 @@ dependencies { implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.android.support:design:28.0.0' testImplementation 'org.mockito:mockito-core:1.10.19' - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' } diff --git a/example_app/app/src/main/cpp/native-lib.cpp b/example_app/app/src/main/cpp/native-lib.cpp index 6be8f3fe8..3ba5c1db3 100644 --- a/example_app/app/src/main/cpp/native-lib.cpp +++ b/example_app/app/src/main/cpp/native-lib.cpp @@ -18,7 +18,7 @@ Java_com_example_declan_myapplication_MainActivity_stringFromJNI( JNIEnv *env, jobject /* this */) { - string Str = "Hello from C++"; + string Str = "Hello from C++\n"; //------------------------------------- boost::chrono::system_clock::time_point p = boost::chrono::system_clock::now(); diff --git a/example_app/build.gradle b/example_app/build.gradle index 4244a30c5..ded884a66 100644 --- a/example_app/build.gradle +++ b/example_app/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' + classpath 'com.android.tools.build:gradle:3.5.3' // NOTE: Do not place your application dependencies here; they belong diff --git a/example_app/local.properties b/example_app/local.properties index 8c1913c1e..b8fa5576f 100644 --- a/example_app/local.properties +++ b/example_app/local.properties @@ -4,12 +4,7 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Fri Mar 22 15:38:23 CET 2019 - - - -sdk.dir=/home/declan/zone/mid/lib/android/sdk -ndk.dir=/home/declan/zone/low/boost/down/ndk/20 - -# boost install dir: should directly contain "include", "libs" subdirs -boost.dir=/home/declan/zone/low/boost/Boost-for-Android/build/install +#Fri Jan 31 15:12:14 CET 2020 +ndk.dir=/home/declan/Documents/zone/mid/bin/android/sdk/ndk/21.0.6113669 +boost.dir=/home/declan/Documents/zone/low/boost/Boost-for-Android/build/ndk_21_boost_1.72.0 +sdk.dir=/home/declan/Documents/zone/mid/bin/android/sdk diff --git a/example_app/screenshot.png b/example_app/screenshot.png old mode 100755 new mode 100644 index 70dc66b78..6ffe79b35 Binary files a/example_app/screenshot.png and b/example_app/screenshot.png differ