From 98620ded7ac29f46ed1d43d4cf470a6781ff87f1 Mon Sep 17 00:00:00 2001 From: MRSa Date: Fri, 5 May 2023 19:01:18 +0900 Subject: [PATCH] =?utf8?q?Android=20SDK=20=E3=82=92=2033=20=E3=81=AB?= =?utf8?q?=E6=9B=B4=E6=96=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 19 +++++---- app/src/main/AndroidManifest.xml | 6 +-- .../res/drawable-v24/ic_launcher_foreground.xml | 45 ++++++++-------------- app/src/main/res/values-ja/colors.xml | 12 ------ app/src/main/res/values-ja/styles.xml | 11 ------ app/src/main/res/values/colors.xml | 4 +- build.gradle | 7 ++-- gradle.properties | 5 ++- 8 files changed, 39 insertions(+), 70 deletions(-) delete mode 100644 app/src/main/res/values-ja/colors.xml delete mode 100644 app/src/main/res/values-ja/styles.xml diff --git a/app/build.gradle b/app/build.gradle index af1cf18..5660c7d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 29 + compileSdkVersion 33 defaultConfig { applicationId "net.osdn.gokigen.gr2control" minSdkVersion 14 - targetSdkVersion 29 + targetSdkVersion 33 versionCode 1003004 versionName "1.3.4" } @@ -15,15 +15,20 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + namespace 'net.osdn.gokigen.gr2control' } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.preference:preference:1.1.1' - implementation 'androidx.exifinterface:exifinterface:1.2.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'com.google.android.material:material:1.1.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.preference:preference:1.2.0' + implementation 'androidx.exifinterface:exifinterface:1.3.6' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'com.google.android.material:material:1.8.0' api files('libs/olycamerakit.jar') } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c7eb69b..08ee13c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + @@ -17,7 +16,8 @@ android:requestLegacyExternalStorage="true" android:supportsRtl="true" android:theme="@style/AppTheme"> - + diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml index c7bd21d..ca638be 100644 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -1,34 +1,19 @@ - - - - - - - - - + android:viewportWidth="50.462574" + android:viewportHeight="50.462574" + android:tint="#EDEDED"> + + + + + diff --git a/app/src/main/res/values-ja/colors.xml b/app/src/main/res/values-ja/colors.xml deleted file mode 100644 index 4e38a01..0000000 --- a/app/src/main/res/values-ja/colors.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - #3F51B5 - #303F9F - #FF4081 - #555555 - #88FFFFFF - #AA555555 - #DD222222 - #EEEEEE - #CCCCCC - diff --git a/app/src/main/res/values-ja/styles.xml b/app/src/main/res/values-ja/styles.xml deleted file mode 100644 index cda8251..0000000 --- a/app/src/main/res/values-ja/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 4e38a01..2268d71 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,8 +2,8 @@ #3F51B5 #303F9F - #FF4081 - #555555 + #03DAC5 + #FF018786 #88FFFFFF #AA555555 #DD222222 diff --git a/build.gradle b/build.gradle index adc6be0..d89f6f7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:8.0.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -16,7 +15,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/gradle.properties b/gradle.properties index 8de5058..9a601ee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,9 +6,12 @@ # 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. +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true -org.gradle.jvmargs=-Xmx1536m +org.gradle.jvmargs=-Xmx2560m # 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 -- 2.11.0