diff --git a/android/buildSrc/src/main/java/wtf/s1/buildsrc/Configs.kt b/android/buildSrc/src/main/java/wtf/s1/buildsrc/Configs.kt index 0f39bd5..87818e2 100644 --- a/android/buildSrc/src/main/java/wtf/s1/buildsrc/Configs.kt +++ b/android/buildSrc/src/main/java/wtf/s1/buildsrc/Configs.kt @@ -10,7 +10,7 @@ object Versions { const val targetSdkVersion = 33 const val compileVersion = 33 const val versionCode = 1 - const val libVersion = "0.2.0-beta.2" + const val libVersion = "0.2.0" const val benchmarkVersion = "1.1.0" const val androidxTestVersion = "1.4.0" const val espressoCoreVersion = "3.5." diff --git a/android/lib-ezlog/src/main/jniLibs/arm64-v8a/libezlog.so b/android/lib-ezlog/src/main/jniLibs/arm64-v8a/libezlog.so index cfd3fd5..f4e6c71 100755 Binary files a/android/lib-ezlog/src/main/jniLibs/arm64-v8a/libezlog.so and b/android/lib-ezlog/src/main/jniLibs/arm64-v8a/libezlog.so differ diff --git a/android/lib-ezlog/src/main/jniLibs/armeabi-v7a/libezlog.so b/android/lib-ezlog/src/main/jniLibs/armeabi-v7a/libezlog.so index a09e369..8feff00 100755 Binary files a/android/lib-ezlog/src/main/jniLibs/armeabi-v7a/libezlog.so and b/android/lib-ezlog/src/main/jniLibs/armeabi-v7a/libezlog.so differ diff --git a/android/lib-ezlog/src/main/jniLibs/x86/libezlog.so b/android/lib-ezlog/src/main/jniLibs/x86/libezlog.so index 30bd887..1689cec 100755 Binary files a/android/lib-ezlog/src/main/jniLibs/x86/libezlog.so and b/android/lib-ezlog/src/main/jniLibs/x86/libezlog.so differ diff --git a/android/lib-ezlog/src/main/jniLibs/x86_64/libezlog.so b/android/lib-ezlog/src/main/jniLibs/x86_64/libezlog.so index f3350ca..f792f0a 100755 Binary files a/android/lib-ezlog/src/main/jniLibs/x86_64/libezlog.so and b/android/lib-ezlog/src/main/jniLibs/x86_64/libezlog.so differ diff --git a/bump.sh b/bump.sh old mode 100644 new mode 100755 index 8950efa..e327147 --- a/bump.sh +++ b/bump.sh @@ -1,12 +1,20 @@ #!/bin/bash set -e +EXCLUDE_DIR='./target' + +# Replace oldstring with the first argument to the script in all files in the current directory and its subdirectories +find . -path "$EXCLUDE_DIR" -prune -o -type f \( -name "*.toml" -o -name "*.kt" -o -name "*.podspec" \) -exec sed -i '' "s/$1/$2/g" {} \; + +# clippy check +cargo clippy --all --all-features -- -D warnings + +# build iOS pushd ios sh b_ios.sh popd +# build android pushd android sh b_android.sh popd - -cargo clippy --workspace --all-features diff --git a/docs/src/architecture.md b/docs/src/architecture.md index 640e353..9abc234 100644 --- a/docs/src/architecture.md +++ b/docs/src/architecture.md @@ -56,5 +56,4 @@ First of all, we need an init nonce, which is generated randomly when the logger ``` nonce = init_nonce ^ timestamp.extend(index) - ``` diff --git a/docs/src/platform/ios.md b/docs/src/platform/ios.md index 87761bb..dbc5f9f 100644 --- a/docs/src/platform/ios.md +++ b/docs/src/platform/ios.md @@ -5,7 +5,7 @@ Add dependency to Podfile ```shell -pod 'EZLog', '~> 0.1' +pod 'EZLog', '~> 0.2' ``` then diff --git a/ezlog-core/Cargo.toml b/ezlog-core/Cargo.toml index c7230d6..6bed7b1 100644 --- a/ezlog-core/Cargo.toml +++ b/ezlog-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ezlog" -version = "0.2.0-beta.2" +version = "0.2.0" edition = "2021" description = "EZLog core function and code" homepage = "https://github.com/s1rius/ezlog" diff --git a/ezlogcli/Cargo.toml b/ezlogcli/Cargo.toml index 35ad1ae..fe4aac1 100644 --- a/ezlogcli/Cargo.toml +++ b/ezlogcli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ezlogcli" -version = "0.2.0-beta.4" +version = "0.2.0" edition = "2021" description = "EZLog command line tool" homepage = "https://github.com/s1rius/ezlog" @@ -10,7 +10,7 @@ keywords = ["ezlog", "cli"] exclude = ["/resources"] [dependencies] -ezlog = { version = "0.2.0-beta.2", path = "../ezlog-core", features = ["decode"] } +ezlog = { version = "0.2.0", path = "../ezlog-core", features = ["decode"] } clap = { version = "4.3.21", features = ["derive"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/ios/EZLog.podspec b/ios/EZLog.podspec index e07c161..34ae509 100644 --- a/ios/EZLog.podspec +++ b/ios/EZLog.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'EZLog' - s.version = '0.2.0-beta.2' + s.version = '0.2.0' s.summary = 'A high efficiency cross-platform Logging Library.' s.swift_version = '5.6' diff --git a/ios/framework/ezlog.xcframework/Info.plist b/ios/framework/ezlog.xcframework/Info.plist index b1b3cd6..fdc9180 100644 --- a/ios/framework/ezlog.xcframework/Info.plist +++ b/ios/framework/ezlog.xcframework/Info.plist @@ -5,35 +5,39 @@ AvailableLibraries + BinaryPath + libezlog.a HeadersPath Headers LibraryIdentifier - ios-arm64 + ios-arm64_x86_64-simulator LibraryPath libezlog.a SupportedArchitectures arm64 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator + BinaryPath + libezlog.a HeadersPath Headers LibraryIdentifier - ios-arm64_x86_64-simulator + ios-arm64 LibraryPath libezlog.a SupportedArchitectures arm64 - x86_64 SupportedPlatform ios - SupportedPlatformVariant - simulator CFBundlePackageType diff --git a/ios/framework/ezlog.xcframework/ios-arm64/libezlog.a b/ios/framework/ezlog.xcframework/ios-arm64/libezlog.a index 7e19c2a..51f2857 100644 Binary files a/ios/framework/ezlog.xcframework/ios-arm64/libezlog.a and b/ios/framework/ezlog.xcframework/ios-arm64/libezlog.a differ diff --git a/ios/framework/ezlog.xcframework/ios-arm64_x86_64-simulator/libezlog.a b/ios/framework/ezlog.xcframework/ios-arm64_x86_64-simulator/libezlog.a index 7558cf7..8e85359 100644 Binary files a/ios/framework/ezlog.xcframework/ios-arm64_x86_64-simulator/libezlog.a and b/ios/framework/ezlog.xcframework/ios-arm64_x86_64-simulator/libezlog.a differ