Skip to content

Update wnfs deps #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Jul 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
4 changes: 2 additions & 2 deletions appmock/build.gradle
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {
}
defaultConfig {
applicationId "land.fx.app"
minSdkVersion 26
minSdkVersion 30
targetSdkVersion 31
versionCode 1
versionName "1.0"
Expand Down Expand Up @@ -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"
Expand Down
188 changes: 126 additions & 62 deletions appmock/src/androidTest/java/land/fx/app/WNFSTest.kt
100644 → 100755

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build.gradle
100644 → 100755
Original file line number Diff line number Diff line change
@@ -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()
Expand Down Expand Up @@ -48,4 +48,4 @@ compileTestKotlin {
kotlinOptions {
jvmTarget = "1.8"
}
}
}
16 changes: 0 additions & 16 deletions dep/wnfs/CHANGELOG.md

This file was deleted.

58 changes: 0 additions & 58 deletions dep/wnfs/Cargo.toml

This file was deleted.

201 changes: 0 additions & 201 deletions dep/wnfs/LICENSE

This file was deleted.

Loading