Update targetSdk to 28

s1204IT · May 14, 2024 · 1ea90e7 · 1ea90e7
1 parent db14290
commit 1ea90e7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,3 +2,4 @@
 *.bat text eol=crlf
 *.jar binary
 *.jks binary
+*.png binary
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -32,7 +32,7 @@ jobs:
           path: |
             ~/.gradle/caches/
             ~/.gradle/wrapper/
-            .gradle/
+            ./.gradle/
           key: ${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
 
       - name: Build with Gradle

diff --git a/DchaSetupWizard/build.gradle b/DchaSetupWizard/build.gradle
@@ -10,7 +10,7 @@ android {
         applicationId 'jp.co.benesse.dcha.setupwizard'
         minSdk 24
         //noinspection ExpiredTargetSdkVersion
-        targetSdk 24
+        targetSdk 28
         versionCode 1
         versionName "1.0.0"
         proguardFiles += 'proguard-rules.pro'
@@ -32,14 +32,12 @@ android {
     }
 
     buildTypes {
-        debug {
-            minifyEnabled false
+        configureEach {
             signingConfig signingConfigs.android
         }
         release {
             minifyEnabled true
             shrinkResources true
-            signingConfig signingConfigs.android
             if (rootProject.file('release.jks').exists()) {
                 signingConfig signingConfigs.release
             }

diff --git a/FirmwareUpdate/build.gradle b/FirmwareUpdate/build.gradle
@@ -3,14 +3,14 @@ plugins {
 }
 
 android {
-    compileSdk 34
+    compileSdk 33
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId 'com.panasonic.sanyo.ts.firmwareupdate'
         minSdk 24
         //noinspection ExpiredTargetSdkVersion
-        targetSdk 24
+        targetSdk 28
         versionCode 1
         versionName "1.0.0"
         proguardFiles += 'proguard-rules.pro'
@@ -32,14 +32,12 @@ android {
     }
 
     buildTypes {
-        debug {
-            minifyEnabled false
+        configureEach {
             signingConfig signingConfigs.android
         }
         release {
             minifyEnabled true
             shrinkResources true
-            signingConfig signingConfigs.android
             if (rootProject.file('release.jks').exists()) {
                 signingConfig signingConfigs.release
             }

diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1 @@
-org.gradle.configuration-cache=true
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
-org.gradle.parallel=true