gladleを更新。画像の少し追加。

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644 (file)
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644 (file)
index 0000000..69e8615
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.8.20" />
+  </component>
+</project>
\ No newline at end of file

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6199cc2..7cfc954 100644 (file)
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

diff --git a/app/build.gradle b/app/build.gradle
index de2335d..7a4909b 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,24 +21,28 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    namespace 'net.osdn.gokigen.watchface.prpr1'
 }
 
 dependencies {
-
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'com.google.android.gms:play-services-wearable:18.0.0'
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0'
     //implementation 'com.google.android.support:wearable:2.9.0'
-    implementation 'com.google.android.gms:play-services-base:18.1.0'
+    implementation 'com.google.android.gms:play-services-base:18.2.0'
     implementation 'androidx.palette:palette-ktx:1.0.0'
     compileOnly 'com.google.android.wearable:wearable:2.9.0'
 
     // Use to implement wear watchfaces
-    implementation "androidx.wear.watchface:watchface:1.2.0-alpha03"
-    implementation "androidx.wear.watchface:watchface-complications-data-source:1.2.0-alpha03"
-    implementation "androidx.wear.watchface:watchface-complications-data-source-ktx:1.2.0-alpha03"
-    implementation "androidx.wear.watchface:watchface-editor:1.2.0-alpha03"
-    implementation "androidx.wear.watchface:watchface-complications-rendering:1.2.0-alpha03"
+    implementation "androidx.wear.watchface:watchface:1.2.0-alpha08"
+    implementation "androidx.wear.watchface:watchface-complications-data-source:1.2.0-alpha08"
+    implementation "androidx.wear.watchface:watchface-complications-data-source-ktx:1.2.0-alpha08"
+    implementation "androidx.wear.watchface:watchface-editor:1.2.0-alpha08"
+    implementation "androidx.wear.watchface:watchface-complications-rendering:1.2.0-alpha08"
 }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 901e7f4..eb1b35b 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.osdn.gokigen.watchface.prpr1">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Required to act as a custom watch face. -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />

diff --git a/app/src/main/java/net/osdn/gokigen/watchface/prpr1/MyWatchFaceHolder.kt b/app/src/main/java/net/osdn/gokigen/watchface/prpr1/MyWatchFaceHolder.kt
index 620cdfe..821d2ae 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/watchface/prpr1/MyWatchFaceHolder.kt
+++ b/app/src/main/java/net/osdn/gokigen/watchface/prpr1/MyWatchFaceHolder.kt
@@ -628,6 +628,10 @@ class MyWatchFaceHolder(private val context: Context)
         setupBackgroundBitmapFromResId(R.drawable.aoi505)
         setupBackgroundBitmapFromResId(R.drawable.aoi506)
         setupBackgroundBitmapFromResId(R.drawable.aoi507)
+        setupBackgroundBitmapFromResId(R.drawable.aoi508)
+        setupBackgroundBitmapFromResId(R.drawable.aoi509)
+        setupBackgroundBitmapFromResId(R.drawable.aoi510)
+        setupBackgroundBitmapFromResId(R.drawable.aoi511)
         setupBackgroundBitmapFromResId(R.drawable.aohina01)
         setupBackgroundBitmapFromResId(R.drawable.aohina02)
         setupBackgroundBitmapFromResId(R.drawable.aohina03)
@@ -793,6 +797,8 @@ class MyWatchFaceHolder(private val context: Context)
         setupBackgroundBitmapFromResId(R.drawable.aohina163)
         setupBackgroundBitmapFromResId(R.drawable.aohina164)
         setupBackgroundBitmapFromResId(R.drawable.aohina165)
+        setupBackgroundBitmapFromResId(R.drawable.aohina166)
+        setupBackgroundBitmapFromResId(R.drawable.aohina167)
         setupBackgroundBitmapFromResId(R.drawable.yama01)
         setupBackgroundBitmapFromResId(R.drawable.yama02)
         setupBackgroundBitmapFromResId(R.drawable.yama03)
@@ -898,6 +904,7 @@ class MyWatchFaceHolder(private val context: Context)
         setupBackgroundBitmapFromResId(R.drawable.aohono07)
         setupBackgroundBitmapFromResId(R.drawable.aohono08)
         setupBackgroundBitmapFromResId(R.drawable.aohono09)
+        setupBackgroundBitmapFromResId(R.drawable.aohono10)
         setupBackgroundBitmapFromResId(R.drawable.honoka01)
         setupBackgroundBitmapFromResId(R.drawable.honoka02)
         setupBackgroundBitmapFromResId(R.drawable.honoka03)
@@ -939,9 +946,20 @@ class MyWatchFaceHolder(private val context: Context)
         setupBackgroundBitmapFromResId(R.drawable.honoka39)
         setupBackgroundBitmapFromResId(R.drawable.honoka40)
         setupBackgroundBitmapFromResId(R.drawable.honoka41)
+        setupBackgroundBitmapFromResId(R.drawable.honoka42)
+        setupBackgroundBitmapFromResId(R.drawable.honoka43)
+        setupBackgroundBitmapFromResId(R.drawable.honoka44)
+        setupBackgroundBitmapFromResId(R.drawable.honoka45)
+        setupBackgroundBitmapFromResId(R.drawable.honoka46)
+        setupBackgroundBitmapFromResId(R.drawable.honoka47)
+        setupBackgroundBitmapFromResId(R.drawable.honoka48)
+        setupBackgroundBitmapFromResId(R.drawable.honoka49)
+        setupBackgroundBitmapFromResId(R.drawable.honoka50)
+        setupBackgroundBitmapFromResId(R.drawable.honoka51)
         setupBackgroundBitmapFromResId(R.drawable.honokoko1)
         setupBackgroundBitmapFromResId(R.drawable.honokoko2)
         setupBackgroundBitmapFromResId(R.drawable.honokoko3)
+        setupBackgroundBitmapFromResId(R.drawable.honokoko4)
         setupBackgroundBitmapFromResId(R.drawable.kaede01)
         setupBackgroundBitmapFromResId(R.drawable.kaede02)
         setupBackgroundBitmapFromResId(R.drawable.kaede03)
@@ -1093,6 +1111,9 @@ class MyWatchFaceHolder(private val context: Context)
         setupBackgroundBitmapFromResId(R.drawable.kokohina17)
         setupBackgroundBitmapFromResId(R.drawable.kokohina18)
         setupBackgroundBitmapFromResId(R.drawable.kokohina19)
+        setupBackgroundBitmapFromResId(R.drawable.kokohina20)
+        setupBackgroundBitmapFromResId(R.drawable.kokohina21)
+        setupBackgroundBitmapFromResId(R.drawable.kokohina22)
         setupBackgroundBitmapFromResId(R.drawable.kokokae01)
         setupBackgroundBitmapFromResId(R.drawable.kokokae02)
         setupBackgroundBitmapFromResId(R.drawable.kokokae03)
@@ -1507,6 +1528,13 @@ class MyWatchFaceHolder(private val context: Context)
         setupBackgroundBitmapFromResId(R.drawable.hinata393)
         setupBackgroundBitmapFromResId(R.drawable.hinata394)
         setupBackgroundBitmapFromResId(R.drawable.hinata395)
+        setupBackgroundBitmapFromResId(R.drawable.hinata396)
+        setupBackgroundBitmapFromResId(R.drawable.hinata397)
+        setupBackgroundBitmapFromResId(R.drawable.hinata398)
+        setupBackgroundBitmapFromResId(R.drawable.hinata399)
+        setupBackgroundBitmapFromResId(R.drawable.hinata400)
+        setupBackgroundBitmapFromResId(R.drawable.hinata401)
+        setupBackgroundBitmapFromResId(R.drawable.hinata402)
         setupBackgroundBitmapFromResId(R.drawable.lets1)
         setupBackgroundBitmapFromResId(R.drawable.lets2)
         setupBackgroundBitmapFromResId(R.drawable.kokona01)
@@ -1647,6 +1675,13 @@ class MyWatchFaceHolder(private val context: Context)
         setupBackgroundBitmapFromResId(R.drawable.kokona136)
         setupBackgroundBitmapFromResId(R.drawable.kokona137)
         setupBackgroundBitmapFromResId(R.drawable.kokona138)
+        setupBackgroundBitmapFromResId(R.drawable.kokona139)
+        setupBackgroundBitmapFromResId(R.drawable.kokona140)
+        setupBackgroundBitmapFromResId(R.drawable.kokona141)
+        setupBackgroundBitmapFromResId(R.drawable.kokona142)
+        setupBackgroundBitmapFromResId(R.drawable.kokona143)
+        setupBackgroundBitmapFromResId(R.drawable.kokona144)
+        setupBackgroundBitmapFromResId(R.drawable.kokona145)
         setupBackgroundBitmapFromResId(R.drawable.kuma)
         System.gc()
 /**/

diff --git a/build.gradle b/build.gradle
index 2a4aa4a..83e1d76 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
+    id 'com.android.application' version '8.0.1' apply false
+    id 'com.android.library' version '8.0.1' apply false
+    id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
 }
 
 task clean(type: Delete) {

diff --git a/gradle.properties b/gradle.properties
index 3c7a8bd..cccbfe6 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,3 +21,5 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 972f56d..8a15f54 100644 (file)
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Oct 15 21:40:08 JST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME