Merge pull request #101 from AAkira/dev/2.5.0

2.5.0
AAkira · Apr 6, 2022 · 7ff848d · 7ff848d
2 parents 910917c + 2c460dd
commit 7ff848d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 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.6.10"
+    private const val kotlin = "1.6.20"
 
     object GradlePlugin {
         const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Dep.kotlin}"

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 = 22
-    const val versionName = "2.4.0"
+    const val versionCode = 23
+    const val versionName = "2.5.0"
 
     // android
     const val androidVersionCode = 1

diff --git a/mpp-sample/mpp_sample.podspec b/mpp-sample/mpp_sample.podspec
@@ -2,24 +2,20 @@ Pod::Spec.new do |spec|
     spec.name                     = 'mpp_sample'
     spec.version                  = '1.0.0'
     spec.homepage                 = 'https://github.com/AAkira/Napier'
-    spec.source                   = { :git => "Not Published", :tag => "Cocoapods/#{spec.name}/#{spec.version}" }
+    spec.source                   = { :http=> ''}
     spec.authors                  = ''
     spec.license                  = ''
     spec.summary                  = 'CocoaPods library'
-
-    spec.vendored_frameworks      = "build/cocoapods/framework/mpp_sample.framework"
-    spec.libraries                = "c++"
-    spec.module_name              = "#{spec.name}_umbrella"
-
+    spec.vendored_frameworks      = 'build/cocoapods/framework/mpp_sample.framework'
+    spec.libraries                = 'c++'
+
 
-
 
-
     spec.pod_target_xcconfig = {
         'KOTLIN_PROJECT_PATH' => ':mpp-sample',
         'PRODUCT_MODULE_NAME' => 'mpp_sample',
     }
-
+                
     spec.script_phases = [
         {
             :name => 'Build mpp_sample',
@@ -35,8 +31,9 @@ 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.configuration="$CONFIGURATION"
             SCRIPT
         }
     ]
+
 end