From a0ebbb0377aee4e21ee9c1ec3d9ac983e760f704 Mon Sep 17 00:00:00 2001 From: AAkira Date: Wed, 6 Apr 2022 23:43:22 +0900 Subject: [PATCH 1/2] Update kotlin 1.6.20. --- buildSrc/src/main/kotlin/dependencies/Dep.kt | 2 +- mpp-sample/mpp_sample.podspec | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/buildSrc/src/main/kotlin/dependencies/Dep.kt b/buildSrc/src/main/kotlin/dependencies/Dep.kt index 1e75c9b..4cc4338 100644 --- 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/mpp-sample/mpp_sample.podspec b/mpp-sample/mpp_sample.podspec index 8b4fac9..ba4f35a 100644 --- 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 \ No newline at end of file From 2c460dd764450ecef2366018cfed685921ec07db Mon Sep 17 00:00:00 2001 From: AAkira Date: Thu, 7 Apr 2022 00:31:46 +0900 Subject: [PATCH 2/2] Bump up the version name. --- buildSrc/src/main/kotlin/dependencies/Versions.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/dependencies/Versions.kt b/buildSrc/src/main/kotlin/dependencies/Versions.kt index 324ebf8..8f7ee90 100644 --- 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