From dda56ee18ce5a6cf0c3dc1634e7785f63e7ae670 Mon Sep 17 00:00:00 2001 From: MRSa Date: Sat, 29 Jan 2022 00:43:19 +0900 Subject: [PATCH] =?utf8?q?API=E3=83=AC=E3=83=99=E3=83=AB=E3=82=9232?= =?utf8?q?=E3=81=BE=E3=81=A7=E5=BC=95=E4=B8=8A=E3=81=92=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 2 +- .idea/gradle.xml | 3 +-- .idea/misc.xml | 2 +- .idea/runConfigurations.xml | 12 ------------ app/build.gradle | 18 +++++++++--------- app/src/main/AndroidManifest.xml | 1 + .../CanonCameraConnectSequenceForPlaybackType1.kt | 3 +-- build.gradle | 10 ++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- 9 files changed, 19 insertions(+), 34 deletions(-) delete mode 100644 .idea/runConfigurations.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 61a9130..fb7f4a8 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 41871c2..4404972 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,7 +5,7 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 334463e..b9d1ffe 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -74,7 +74,7 @@ - + diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 7278edf..d211dd5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion 30 + compileSdkVersion 32 defaultConfig { applicationId "net.osdn.gokigen.pkremote" minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 32 versionCode 10802 versionName "1.8.2" } @@ -20,16 +20,16 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.exifinterface:exifinterface:1.3.2' - implementation 'androidx.preference:preference-ktx:1.1.1' - implementation 'com.google.android.material:material:1.2.1' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'androidx.exifinterface:exifinterface:1.3.3' + implementation 'androidx.preference:preference-ktx:1.2.0' + implementation 'com.google.android.material:material:1.5.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.3' implementation 'androidx.vectordrawable:vectordrawable:1.1.0' api files('libs/olycamerakit.jar') - implementation "androidx.core:core-ktx:1.3.2" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "androidx.core:core-ktx:1.7.0" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } repositories { mavenCentral() diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ff37579..a3401c1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,6 +25,7 @@ android:theme="@style/AppTheme"> diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/ptpip/wrapper/connection/CanonCameraConnectSequenceForPlaybackType1.kt b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/ptpip/wrapper/connection/CanonCameraConnectSequenceForPlaybackType1.kt index 72ea1d8..ac5ee58 100644 --- a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/ptpip/wrapper/connection/CanonCameraConnectSequenceForPlaybackType1.kt +++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/ptpip/wrapper/connection/CanonCameraConnectSequenceForPlaybackType1.kt @@ -64,7 +64,7 @@ class CanonCameraConnectSequenceForPlaybackType1(val context: Activity, val came return false } - @ExperimentalUnsignedTypes + //@ExperimentalUnsignedTypes override fun receivedMessage(id: Int, rx_body: ByteArray) { when (id) @@ -119,7 +119,6 @@ class CanonCameraConnectSequenceForPlaybackType1(val context: Activity, val came //commandIssuer.enqueueCommand(CanonRegistrationMessage(this)) } - @ExperimentalUnsignedTypes private fun sendInitEventRequest(receiveData: ByteArray) { interfaceProvider.informationReceiver.updateMessage(context.getString(R.string.connect_start_2), false, false, 0) diff --git a/build.gradle b/build.gradle index 0848356..51a96fc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.4.21' + ext.kotlin_version = '1.6.10' repositories { google() - jcenter() - + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:7.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -19,8 +18,7 @@ buildscript { allprojects { repositories { google() - jcenter() - + mavenCentral() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f7d30..34c2003 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip -- 2.11.0