Merge pull request #18 from functionland/update-wnfs-deps

Update wnfs deps
functionland · Jul 16, 2023 · fe7798e · fe7798e
2 parents 52742a4 + b3ba93b
commit fe7798e
Show file tree

Hide file tree

Showing 65 changed files with 875 additions and 12,771 deletions.
diff --git a/Readme.md b/Readme.md
@@ -30,6 +30,19 @@ Use Ubuntu (on Windows it complains about openssl)
 - gradle
 - rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android
 
+## Common Errors
+- Make sure the build.gradle shows the correct ndk version you have if you see:
+
+```bash
+[CXX1104] NDK from ndk.dir at /.../ndk/25.2.9519653 had version [25....] which disagrees with android.ndkVersion [25.1.8937393]
+```
+
+- Make sure you define a local.properties file in the project root with the below line in it if you see NDK not found:
+- 
+```bash
+ndk.dir=/paht-to-ndk/ndk/25.....
+```
+
 ## Debug
 
 Make sure you have switch to `debug` profile in cargo config, which could be found at `lib/build.gradle` 

diff --git a/appmock/build.gradle b/appmock/build.gradle
@@ -10,7 +10,7 @@ android {
     }
     defaultConfig {
         applicationId "land.fx.app"
-        minSdkVersion 26
+        minSdkVersion 30
         targetSdkVersion 31
         versionCode 1
         versionName "1.0"
@@ -49,7 +49,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    implementation 'com.github.functionland:fula-build-aar:v0.7.4' // From jitpack.io
+    implementation 'com.github.functionland:fula-build-aar:v1.13.0' // From jitpack.io
     testImplementation 'junit:junit:4.+'
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1'
     testImplementation "androidx.arch.core:core-testing:2.1.0"

diff --git a/appmock/src/androidTest/java/land/fx/app/WNFSTest.kt b/appmock/src/androidTest/java/land/fx/app/WNFSTest.kt
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext.kotlin_version = '1.7.10'
-    ext.ndkVersion = '25.1.8937393'
+    ext.ndkVersion = '25.2.9519653'
     repositories {
         google()
         jcenter()
@@ -48,4 +48,4 @@ compileTestKotlin {
     kotlinOptions {
         jvmTarget = "1.8"
     }
-}
+}
diff --git a/dep/wnfs/CHANGELOG.md b/dep/wnfs/CHANGELOG.md
diff --git a/dep/wnfs/Cargo.toml b/dep/wnfs/Cargo.toml
diff --git a/dep/wnfs/LICENSE b/dep/wnfs/LICENSE