Merge pull request #90 from AAkira/dev/2.2.0

2.2.0
AAkira · Nov 17, 2021 · 4cc0e6f · 4cc0e6f
2 parents 76fa7a3 + 32f8f05
commit 4cc0e6f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/buildSrc/src/main/kotlin/dependencies/Dep.kt b/buildSrc/src/main/kotlin/dependencies/Dep.kt
@@ -2,7 +2,7 @@ package dependencies
 
 object Dep {
 
-    private const val kotlin = "1.5.30"
+    private const val kotlin = "1.6.0"
 
     object GradlePlugin {
         const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Dep.kotlin}"
@@ -20,7 +20,7 @@ object Dep {
     }
 
     object Coroutines {
-        private const val version = "1.5.1-native-mt"
+        private const val version = "1.5.2-native-mt"
 
         const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
     }

diff --git a/buildSrc/src/main/kotlin/dependencies/Versions.kt b/buildSrc/src/main/kotlin/dependencies/Versions.kt
@@ -1,8 +1,8 @@
 package dependencies
 
 object Versions {
-    const val versionCode = 19
-    const val versionName = "2.1.0"
+    const val versionCode = 20
+    const val versionName = "2.2.0"
 
     // android
     const val androidVersionCode = 1

diff --git a/ios/Gemfile.lock b/ios/Gemfile.lock
@@ -68,9 +68,10 @@ GEM
 
 PLATFORMS
   ruby
+  x86_64-darwin-19
 
 DEPENDENCIES
   cocoapods (= 1.6.0)
 
 BUNDLED WITH
-   2.0.1
+   2.2.2
diff --git a/ios/Napier/ViewController.swift b/ios/Napier/ViewController.swift
@@ -24,6 +24,6 @@ private extension ViewController {
 
         sample.handleError()
 
-        Napier.d("Hello from Napier", 123)
+        Napier.d("Hello", "from Swift")
     }
 }
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -70,7 +70,7 @@ SPEC CHECKSUMS:
   FirebaseInstallations: bf2ec8dbf36ff4c91af6b9a003d15855757680c1
   GoogleDataTransport: cd9db2180fcecd8da1b561aea31e3e56cf834aa7
   GoogleUtilities: e1d9ed4e544fc32a93e00e721400cbc3f377200d
-  mpp_sample: 07fdbc60934b60a9bbfb833df6298899fe345026
+  mpp_sample: 967ec869a75e439dbe4f674ea3bd3b4817776de9
   nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
   PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
 

diff --git a/mpp-sample/mpp_sample.podspec b/mpp-sample/mpp_sample.podspec
@@ -35,10 +35,7 @@ Pod::Spec.new do |spec|
                 "$REPO_ROOT/../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \
                     -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \
                     -Pkotlin.native.cocoapods.archs="$ARCHS" \
-                    -Pkotlin.native.cocoapods.configuration=$CONFIGURATION \
-                    -Pkotlin.native.cocoapods.cflags="$OTHER_CFLAGS" \
-                    -Pkotlin.native.cocoapods.paths.headers="$HEADER_SEARCH_PATHS" \
-                    -Pkotlin.native.cocoapods.paths.frameworks="$FRAMEWORK_SEARCH_PATHS"
+                    -Pkotlin.native.cocoapods.configuration=$CONFIGURATION
             SCRIPT
         }
     ]