SDKを最新に更新する。

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9114523..867d41f 100644 (file)
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -15,7 +15,6 @@
             <option value="$PROJECT_DIR$/wear" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 77ef43e..546bcfa 100644 (file)
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,9 +2,15 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/A01c.iml" filepath="$PROJECT_DIR$/A01c.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/A01c.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/A01c.app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/wear/A01c.wear.iml" filepath="$PROJECT_DIR$/.idea/modules/wear/A01c.wear.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/OSDN_repositories.A01c.iml" filepath="$PROJECT_DIR$/.idea/modules/OSDN_repositories.A01c.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/OSDN_repositories.A01c.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/OSDN_repositories.A01c.app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/OSDN_repositories.A01c.app.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/OSDN_repositories.A01c.app.androidTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/OSDN_repositories.A01c.app.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app/OSDN_repositories.A01c.app.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/OSDN_repositories.A01c.app.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/OSDN_repositories.A01c.app.unitTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/wear/OSDN_repositories.A01c.wear.iml" filepath="$PROJECT_DIR$/.idea/modules/wear/OSDN_repositories.A01c.wear.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/wear/OSDN_repositories.A01c.wear.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/wear/OSDN_repositories.A01c.wear.androidTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/wear/OSDN_repositories.A01c.wear.main.iml" filepath="$PROJECT_DIR$/.idea/modules/wear/OSDN_repositories.A01c.wear.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/wear/OSDN_repositories.A01c.wear.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/wear/OSDN_repositories.A01c.wear.unitTest.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index dd08835..34c6e44 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
     defaultConfig {
         applicationId "jp.sfjp.gokigen.a01c"
         minSdkVersion 23
-        targetSdkVersion 32
-        versionCode 41
-        versionName "1.4.2"
+        targetSdkVersion 33
+        versionCode 43
+        versionName "1.4.3"
     }
     buildTypes {
         release {
@@ -36,13 +36,13 @@ dependencies {
     compileOnly 'com.google.android.wearable:wearable:2.9.0'
 
     implementation 'com.google.android.support:wearable:2.9.0'
-    implementation 'com.google.android.gms:play-services-wearable:17.1.0'
-    implementation 'com.android.support:wear:32.0.0'
+    implementation 'com.google.android.gms:play-services-wearable:18.0.0'
+    implementation 'com.android.support:wear:33.0.0'
 
     implementation 'androidx.wear:wear:1.2.0'
     implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.exifinterface:exifinterface:1.3.3'
-    implementation 'com.google.android.material:material:1.6.0'
-    implementation "androidx.core:core-ktx:1.7.0"
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.exifinterface:exifinterface:1.3.6'
+    implementation 'com.google.android.material:material:1.8.0'
+    implementation "androidx.core:core-ktx:1.9.0"
 }

diff --git a/build.gradle b/build.gradle
index e565f98..eaa5395 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.6.21"
+    ext.kotlin_version = "1.8.0"
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle.properties b/gradle.properties
index a13bff3..56d0748 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,25 +1,17 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
+## For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
-
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app"s APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
+#Sat Mar 18 09:37:34 JST 2023
+kotlin.code.style=official
+org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-# Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d9ccb34..4a643a0 100644 (file)
--- 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-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

diff --git a/wear/build.gradle b/wear/build.gradle
index aa5f241..bad783d 100644 (file)
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
     defaultConfig {
         applicationId "jp.sfjp.gokigen.a01c"
         minSdkVersion 23
-        targetSdkVersion 32
-        versionCode 42
-        versionName "1.4.2"
+        targetSdkVersion 33
+        versionCode 44
+        versionName "1.4.3"
     }
     buildTypes {
         release {
@@ -29,15 +29,15 @@ dependencies {
     compileOnly 'com.google.android.wearable:wearable:2.9.0'
 
     implementation 'com.google.android.support:wearable:2.9.0'
-    implementation 'com.google.android.gms:play-services-wearable:17.1.0'
-    implementation 'com.android.support:wear:32.0.0'
+    implementation 'com.google.android.gms:play-services-wearable:18.0.0'
+    implementation 'com.android.support:wear:33.0.0'
 
     implementation 'androidx.wear:wear:1.2.0'
     implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.exifinterface:exifinterface:1.3.3'
-    implementation 'com.google.android.material:material:1.6.0'
-    implementation "androidx.core:core-ktx:1.7.0"
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.exifinterface:exifinterface:1.3.6'
+    implementation 'com.google.android.material:material:1.8.0'
+    implementation "androidx.core:core-ktx:1.9.0"
 
     api files('libs/olycamerakit.jar')
 }

diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml
index 43025d5..d8e6585 100644 (file)
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@@ -17,6 +17,8 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
+        android:usesCleartextTraffic="true"
+        android:requestLegacyExternalStorage="true"
         android:theme="@style/AppTheme">
         <!--android:theme="@android:style/Theme.DeviceDefault"-->
         <uses-library android:name="com.google.android.wearable" android:required="false" />

diff --git a/wear/src/main/java/jp/sfjp/gokigen/a01c/utils/GestureParser.kt b/wear/src/main/java/jp/sfjp/gokigen/a01c/utils/GestureParser.kt
index 52aea9e..45b3fc0 100644 (file)
--- a/wear/src/main/java/jp/sfjp/gokigen/a01c/utils/GestureParser.kt
+++ b/wear/src/main/java/jp/sfjp/gokigen/a01c/utils/GestureParser.kt
@@ -12,33 +12,33 @@ class GestureParser(context : Context, private val imageView : ILiveViewRefreshe
     private val scaleGestureDetector = ScaleGestureDetector(context, this)
 
     // View.OnTouchListener
-    fun onTouch(event: MotionEvent?): Boolean
+    fun onTouch(event: MotionEvent): Boolean
     {
         return (gestureDetector.onTouchEvent(event) || scaleGestureDetector.onTouchEvent(event))
     }
 
     // GestureDetector.OnGestureListener
-    override fun onDown(e: MotionEvent?): Boolean
+    override fun onDown(e: MotionEvent): Boolean
     {
         //Log.v(TAG, " Gesture onDown")
         return (false)
     }
 
     // GestureDetector.OnGestureListener
-    override fun onShowPress(e: MotionEvent?)
+    override fun onShowPress(e: MotionEvent)
     {
         //Log.v(TAG, " Gesture onShowPress")
     }
 
     // GestureDetector.OnGestureListener
-    override fun onSingleTapUp(e: MotionEvent?): Boolean
+    override fun onSingleTapUp(e: MotionEvent): Boolean
     {
         //Log.v(TAG, " Gesture onSingleTapUp")
         return (false)
     }
 
     // GestureDetector.OnGestureListener
-    override fun onScroll(e1: MotionEvent?, e2: MotionEvent?, distanceX: Float, distanceY: Float): Boolean
+    override fun onScroll(e1: MotionEvent, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean
     {
         //Log.v(TAG, " Gesture onScroll")
         imageView.moveView(distanceX, distanceY)
@@ -46,30 +46,27 @@ class GestureParser(context : Context, private val imageView : ILiveViewRefreshe
     }
 
     // GestureDetector.OnGestureListener
-    override fun onLongPress(e: MotionEvent?)
+    override fun onLongPress(e: MotionEvent)
     {
         //Log.v(TAG, " Gesture onLongPress")
         imageView.resetView()
     }
 
     // GestureDetector.OnGestureListener
-    override fun onFling(e1: MotionEvent?, e2: MotionEvent?, velocityX: Float, velocityY: Float): Boolean
+    override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean
     {
         //Log.v(TAG, " Gesture onFling")
         return (false)
     }
 
     // ScaleGestureDetector.OnScaleGestureListener
-    override fun onScale(detector: ScaleGestureDetector?): Boolean
+    override fun onScale(detector: ScaleGestureDetector): Boolean
     {
         //Log.v(TAG, " Gesture onScale")
         try
         {
-            if (detector != null)
-            {
-                imageView.setScaleFactor(detector.scaleFactor)
-                return (true)
-            }
+            imageView.setScaleFactor(detector.scaleFactor)
+            return (true)
         }
         catch (e : Exception)
         {
@@ -79,14 +76,14 @@ class GestureParser(context : Context, private val imageView : ILiveViewRefreshe
     }
 
     // ScaleGestureDetector.OnScaleGestureListener
-    override fun onScaleBegin(detector: ScaleGestureDetector?): Boolean
+    override fun onScaleBegin(detector: ScaleGestureDetector): Boolean
     {
         //Log.v(TAG, " Gesture onScaleBegin")
         return (true)
     }
 
     // ScaleGestureDetector.OnScaleGestureListener
-    override fun onScaleEnd(detector: ScaleGestureDetector?)
+    override fun onScaleEnd(detector: ScaleGestureDetector)
     {
         //Log.v(TAG, " Gesture onScaleEnd")
     }