From b4fcb62ab6c970e5bd51f99b76d95801a254da6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=BE=E5=B2=A1=E3=80=80=E4=BE=91=E5=87=9B?= <129148471+LassicYM@users.noreply.github.com> Date: Tue, 6 Aug 2024 14:40:23 +0900 Subject: [PATCH 1/2] fixed getThetaLicense error for V. --- .../com/ricoh360/thetaclient/ThetaRepository.kt | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/kotlin-multiplatform/src/commonMain/kotlin/com/ricoh360/thetaclient/ThetaRepository.kt b/kotlin-multiplatform/src/commonMain/kotlin/com/ricoh360/thetaclient/ThetaRepository.kt index 734533a759..cee22ef2b1 100644 --- a/kotlin-multiplatform/src/commonMain/kotlin/com/ricoh360/thetaclient/ThetaRepository.kt +++ b/kotlin-multiplatform/src/commonMain/kotlin/com/ricoh360/thetaclient/ThetaRepository.kt @@ -415,7 +415,19 @@ class ThetaRepository internal constructor(val endpoint: String, config: Config? if (response.status != HttpStatusCode.OK) { throw ThetaWebApiException(response.toString()) } - return response.bodyAsText() + val input = response.body() + val builder = StringBuilder() + try { + while (!input.endOfInput) { + val char = input.readText(1, 1) + builder.append(char) + } + } catch (e: Throwable) { + throw e + } finally { + input.close() + } + return builder.toString() } catch (e: JsonConvertException) { throw ThetaWebApiException(e.message ?: e.toString()) } catch (e: ResponseException) { From 1acb09ef799ef10a455e77904baa743ad6926bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=BE=E5=B2=A1=E3=80=80=E4=BE=91=E5=87=9B?= <129148471+LassicYM@users.noreply.github.com> Date: Tue, 6 Aug 2024 14:40:42 +0900 Subject: [PATCH 2/2] Update version to 1.10.1 --- demos/demo-android/app/build.gradle | 2 +- demos/demo-ios/Podfile | 2 +- demos/demo-react-native/package.json | 2 +- docs/tutorial-android.ja.md | 2 +- docs/tutorial-android.md | 2 +- flutter/android/build.gradle | 2 +- flutter/ios/theta_client_flutter.podspec | 4 ++-- flutter/pubspec.yaml | 6 +++--- kotlin-multiplatform/build.gradle.kts | 2 +- react-native/android/build.gradle | 2 +- react-native/package.json | 2 +- react-native/theta-client-react-native.podspec | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/demos/demo-android/app/build.gradle b/demos/demo-android/app/build.gradle index f232ce693b..1d266bc7d5 100755 --- a/demos/demo-android/app/build.gradle +++ b/demos/demo-android/app/build.gradle @@ -75,7 +75,7 @@ dependencies { implementation 'com.jakewharton.timber:timber:5.0.1' implementation 'io.coil-kt:coil-compose:2.2.2' implementation "io.ktor:ktor-client-cio:2.3.9" - implementation "com.ricoh360.thetaclient:theta-client:1.10.0" + implementation "com.ricoh360.thetaclient:theta-client:1.10.1" testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0' testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version" diff --git a/demos/demo-ios/Podfile b/demos/demo-ios/Podfile index 50402c470d..d49d378596 100644 --- a/demos/demo-ios/Podfile +++ b/demos/demo-ios/Podfile @@ -7,5 +7,5 @@ target 'SdkSample' do use_frameworks! # Pods for SdkSample - pod 'THETAClient', '1.10.0' + pod 'THETAClient', '1.10.1' end diff --git a/demos/demo-react-native/package.json b/demos/demo-react-native/package.json index 2661b23e53..b706df7f41 100644 --- a/demos/demo-react-native/package.json +++ b/demos/demo-react-native/package.json @@ -13,7 +13,7 @@ "dependencies": { "@react-navigation/native": "^6.1.0", "@react-navigation/native-stack": "^6.9.5", - "theta-client-react-native": "1.10.0", + "theta-client-react-native": "1.10.1", "react": "18.2.0", "react-native": "0.71.14", "react-native-safe-area-context": "^4.4.1", diff --git a/docs/tutorial-android.ja.md b/docs/tutorial-android.ja.md index 79eb8fb658..7fdafad0a3 100644 --- a/docs/tutorial-android.ja.md +++ b/docs/tutorial-android.ja.md @@ -4,7 +4,7 @@ - モジュールの`build.gradle`の`dependencies`に次を追加します。 ``` - implementation "com.ricoh360.thetaclient:theta-client:1.10.0" + implementation "com.ricoh360.thetaclient:theta-client:1.10.1" ``` - 本 SDK を使用したアプリケーションが動作するスマートフォンと THETA を無線 LAN 接続しておきます。 diff --git a/docs/tutorial-android.md b/docs/tutorial-android.md index b619cecf07..9207cfa435 100644 --- a/docs/tutorial-android.md +++ b/docs/tutorial-android.md @@ -5,7 +5,7 @@ - Add following descriptions to the `dependencies` of your module's `build.gradle`. ``` - implementation "com.ricoh360.thetaclient:theta-client:1.10.0" + implementation "com.ricoh360.thetaclient:theta-client:1.10.1" ``` - Connect the wireless LAN between THETA and the smartphone that runs on the application using this SDK. diff --git a/flutter/android/build.gradle b/flutter/android/build.gradle index a29a08dc2d..cf4b96a93d 100644 --- a/flutter/android/build.gradle +++ b/flutter/android/build.gradle @@ -53,5 +53,5 @@ dependencies { implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.9") implementation("com.soywiz.korlibs.krypto:krypto:4.0.10") - implementation("com.ricoh360.thetaclient:theta-client:1.10.0") + implementation("com.ricoh360.thetaclient:theta-client:1.10.1") } diff --git a/flutter/ios/theta_client_flutter.podspec b/flutter/ios/theta_client_flutter.podspec index 0c88db1af0..3f18b48c16 100644 --- a/flutter/ios/theta_client_flutter.podspec +++ b/flutter/ios/theta_client_flutter.podspec @@ -4,7 +4,7 @@ # Pod::Spec.new do |s| s.name = 'theta_client_flutter' - s.version = '1.10.0' + s.version = '1.10.1' s.summary = 'theta-client plugin project.' s.description = <<-DESC theta-client Flutter plugin project. @@ -17,7 +17,7 @@ Pod::Spec.new do |s| s.dependency 'Flutter' s.platform = :ios, '15.0' - s.dependency 'THETAClient', '1.10.0' + s.dependency 'THETAClient', '1.10.1' # Flutter.framework does not contain a i386 slice. s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' } diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml index ce8f66a9ca..50f7b319c6 100644 --- a/flutter/pubspec.yaml +++ b/flutter/pubspec.yaml @@ -1,11 +1,11 @@ name: theta_client_flutter description: THETA Client Flutter plugin project. -version: 1.10.0 +version: 1.10.1 homepage: environment: - sdk: '>=3.2.3 <4.0.0' - flutter: '>=3.3.0' + sdk: ">=3.2.3 <4.0.0" + flutter: ">=3.3.0" dependencies: flutter: diff --git a/kotlin-multiplatform/build.gradle.kts b/kotlin-multiplatform/build.gradle.kts index d6514eaa19..dbd3ea580a 100644 --- a/kotlin-multiplatform/build.gradle.kts +++ b/kotlin-multiplatform/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { dokkaPlugin("org.jetbrains.dokka:versioning-plugin:1.9.10") } -val thetaClientVersion = "1.10.0" +val thetaClientVersion = "1.10.1" group = "com.ricoh360.thetaclient" version = thetaClientVersion diff --git a/react-native/android/build.gradle b/react-native/android/build.gradle index 88207bae54..87395227d7 100644 --- a/react-native/android/build.gradle +++ b/react-native/android/build.gradle @@ -135,7 +135,7 @@ dependencies { implementation "com.facebook.react:react-native:+" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3" - implementation "com.ricoh360.thetaclient:theta-client:1.10.0" + implementation "com.ricoh360.thetaclient:theta-client:1.10.1" // From node_modules } diff --git a/react-native/package.json b/react-native/package.json index 5f131060dd..7be7e549d8 100644 --- a/react-native/package.json +++ b/react-native/package.json @@ -1,6 +1,6 @@ { "name": "theta-client-react-native", - "version": "1.10.0", + "version": "1.10.1", "description": "This library provides a way to control RICOH THETA using.", "main": "lib/commonjs/index", "module": "lib/module/index", diff --git a/react-native/theta-client-react-native.podspec b/react-native/theta-client-react-native.podspec index 888d6cbf21..0f3cb25055 100644 --- a/react-native/theta-client-react-native.podspec +++ b/react-native/theta-client-react-native.podspec @@ -17,7 +17,7 @@ Pod::Spec.new do |s| s.source_files = "ios/**/*.{h,m,mm,swift}" s.dependency "React-Core" - s.dependency "THETAClient", "1.10.0" + s.dependency "THETAClient", "1.10.1" # Don't install the dependencies when we run `pod install` in the old architecture. if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then