Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev/1.11.1 #96

Merged
merged 3 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion demos/demo-android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.0"
implementation "com.ricoh360.thetaclient:theta-client:1.11.1"

testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0'
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ target 'SdkSample' do
use_frameworks!

# Pods for SdkSample
pod 'THETAClient', '1.11.0'
pod 'THETAClient', '1.11.1'
end
2 changes: 1 addition & 1 deletion demos/demo-react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@react-navigation/native": "^6.1.0",
"@react-navigation/native-stack": "^6.9.5",
"theta-client-react-native": "1.11.0",
"theta-client-react-native": "1.11.1",
"react": "18.2.0",
"react-native": "0.71.14",
"react-native-safe-area-context": "^4.4.1",
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorial-android.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

- モジュールの`build.gradle`の`dependencies`に次を追加します。
```
implementation "com.ricoh360.thetaclient:theta-client:1.11.0"
implementation "com.ricoh360.thetaclient:theta-client:1.11.1"
```
- 本 SDK を使用したアプリケーションが動作するスマートフォンと THETA を無線 LAN 接続しておきます。

Expand Down
2 changes: 1 addition & 1 deletion docs/tutorial-android.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
- Add following descriptions to the `dependencies` of your module's `build.gradle`.

```
implementation "com.ricoh360.thetaclient:theta-client:1.11.0"
implementation "com.ricoh360.thetaclient:theta-client:1.11.1"
```

- Connect the wireless LAN between THETA and the smartphone that runs on the application using this SDK.
Expand Down
2 changes: 1 addition & 1 deletion flutter/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.0")
implementation("com.ricoh360.thetaclient:theta-client:1.11.1")
}
4 changes: 2 additions & 2 deletions flutter/ios/theta_client_flutter.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
Pod::Spec.new do |s|
s.name = 'theta_client_flutter'
s.version = '1.11.0'
s.version = '1.11.1'
s.summary = 'theta-client plugin project.'
s.description = <<-DESC
theta-client Flutter plugin project.
Expand All @@ -17,7 +17,7 @@ Pod::Spec.new do |s|
s.dependency 'Flutter'
s.platform = :ios, '15.0'

s.dependency 'THETAClient', '1.11.0'
s.dependency 'THETAClient', '1.11.1'

# Flutter.framework does not contain a i386 slice.
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
Expand Down
2 changes: 1 addition & 1 deletion flutter/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: theta_client_flutter
description: THETA Client Flutter plugin project.
version: 1.11.0
version: 1.11.1
homepage:

environment:
Expand Down
4 changes: 2 additions & 2 deletions kotlin-multiplatform/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {
dokkaPlugin("org.jetbrains.dokka:versioning-plugin:1.9.10")
}

val thetaClientVersion = "1.11.0"
val thetaClientVersion = "1.11.1"
group = "com.ricoh360.thetaclient"
version = thetaClientVersion

Expand Down Expand Up @@ -105,7 +105,7 @@ kotlin {

android {
namespace = "com.ricoh360.thetaclient"
compileSdk = 33
compileSdk = 34
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
defaultConfig {
minSdk = 26
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -416,18 +416,9 @@ class ThetaRepository internal constructor(val endpoint: String, config: Config?
throw ThetaWebApiException(response.toString())
}
val input = response.body<ByteReadPacket>()
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()
val bytes = input.readBytes()
// decodeToString replaces invalid byte sequence with \uFFFD
return bytes.decodeToString()
} catch (e: JsonConvertException) {
throw ThetaWebApiException(e.message ?: e.toString())
} catch (e: ResponseException) {
Expand Down Expand Up @@ -7789,7 +7780,10 @@ 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<ByteReadPacket>()
val bytes = input.readBytes()
// decodeToString replaces invalid byte sequence with \uFFFD
return bytes.decodeToString()
} catch (e: JsonConvertException) {
throw ThetaWebApiException(e.message ?: e.toString())
} catch (e: ResponseException) {
Expand Down
2 changes: 1 addition & 1 deletion react-native/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.0"
implementation "com.ricoh360.thetaclient:theta-client:1.11.1"

// From node_modules
}
Expand Down
2 changes: 1 addition & 1 deletion react-native/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "theta-client-react-native",
"version": "1.11.0",
"version": "1.11.1",
"description": "This library provides a way to control RICOH THETA using.",
"main": "lib/commonjs/index",
"module": "lib/module/index",
Expand Down
1 change: 1 addition & 0 deletions react-native/src/theta-repository/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export * from './theta-config';
export * from './theta-files';
export * from './theta-info';
export * from './theta-meta';
export * from './theta-plugin';
export * from './theta-repository';
export * from './theta-state';
export * from './theta-timeout';
2 changes: 1 addition & 1 deletion react-native/theta-client-react-native.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.0"
s.dependency "THETAClient", "1.11.1"

# Don't install the dependencies when we run `pod install` in the old architecture.
if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
Expand Down
Loading