• R/O
  • HTTP
  • SSH
  • HTTPS

A01d: Commit

OPC(Olympus Air)用望遠鏡アプリ。


Commit MetaInfo

Révision9b3d941a9a07114fe1ea29348f4562bd7ce534a6 (tree)
l'heure2023-01-19 23:29:46
AuteurMRSa <mrsa@myad...>
CommiterMRSa

Message de Log

最新SDKに更新。

Change Summary

Modification

--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,24 +1,10 @@
11 <component name="ProjectCodeStyleConfiguration">
22 <code_scheme name="Project" version="173">
33 <JetCodeStyleSettings>
4- <option name="PACKAGES_TO_USE_STAR_IMPORTS">
5- <value>
6- <package name="java.util" alias="false" withSubpackages="false" />
7- <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
8- <package name="io.ktor" alias="false" withSubpackages="true" />
9- </value>
10- </option>
11- <option name="PACKAGES_IMPORT_LAYOUT">
12- <value>
13- <package name="" alias="false" withSubpackages="true" />
14- <package name="java" alias="false" withSubpackages="true" />
15- <package name="javax" alias="false" withSubpackages="true" />
16- <package name="kotlin" alias="false" withSubpackages="true" />
17- <package name="" alias="true" withSubpackages="true" />
18- </value>
19- </option>
4+ <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
205 </JetCodeStyleSettings>
216 <codeStyleSettings language="XML">
7+ <option name="FORCE_REARRANGE_MODE" value="1" />
228 <indentOptions>
239 <option name="CONTINUATION_INDENT_SIZE" value="4" />
2410 </indentOptions>
@@ -130,5 +116,8 @@
130116 </rules>
131117 </arrangement>
132118 </codeStyleSettings>
119+ <codeStyleSettings language="kotlin">
120+ <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
121+ </codeStyleSettings>
133122 </code_scheme>
134123 </component>
\ No newline at end of file
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,13 +8,13 @@
88 <option name="testRunner" value="GRADLE" />
99 <option name="distributionType" value="DEFAULT_WRAPPED" />
1010 <option name="externalProjectPath" value="$PROJECT_DIR$" />
11+ <option name="gradleJvm" value="Embedded JDK" />
1112 <option name="modules">
1213 <set>
1314 <option value="$PROJECT_DIR$" />
1415 <option value="$PROJECT_DIR$/app" />
1516 </set>
1617 </option>
17- <option name="resolveModulePerSourceSet" value="false" />
1818 </GradleProjectSettings>
1919 </option>
2020 </component>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -122,7 +122,7 @@
122122 </value>
123123 </option>
124124 </component>
125- <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
125+ <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
126126 <output url="file://$PROJECT_DIR$/build/classes" />
127127 </component>
128128 <component name="ProjectType">
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,11 @@
22 <project version="4">
33 <component name="ProjectModuleManager">
44 <modules>
5- <module fileurl="file://$PROJECT_DIR$/A01d.iml" filepath="$PROJECT_DIR$/A01d.iml" />
5+ <module fileurl="file://$PROJECT_DIR$/.idea/modules/A01d.iml" filepath="$PROJECT_DIR$/.idea/modules/A01d.iml" />
66 <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/A01d.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/A01d.app.iml" />
7+ <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/A01d.app.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/A01d.app.androidTest.iml" />
8+ <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/A01d.app.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app/A01d.app.main.iml" />
9+ <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/A01d.app.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/A01d.app.unitTest.iml" />
710 </modules>
811 </component>
912 </project>
\ No newline at end of file
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
22 apply plugin: 'kotlin-android'
33
44 android {
5- compileSdkVersion 32
5+ compileSdkVersion 33
66 defaultConfig {
77 applicationId "net.osdn.gokigen.a01d"
88 minSdkVersion 14
9- targetSdkVersion 32
10- versionCode 10908
11- versionName "1.9.8"
9+ targetSdkVersion 33
10+ versionCode 10909
11+ versionName "1.9.9"
1212 }
1313 buildTypes {
1414 release {
@@ -16,19 +16,20 @@ android {
1616 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1717 }
1818 }
19+ namespace 'net.osdn.gokigen.a01d'
1920 }
2021
2122 dependencies {
2223 api fileTree(dir: 'libs', include: ['*.jar'])
23- implementation 'androidx.appcompat:appcompat:1.4.1'
24- implementation 'androidx.exifinterface:exifinterface:1.3.3'
24+ implementation 'androidx.appcompat:appcompat:1.6.0'
25+ implementation 'androidx.exifinterface:exifinterface:1.3.5'
2526 implementation 'androidx.preference:preference-ktx:1.2.0'
26- implementation 'com.google.android.material:material:1.5.0'
27- implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
27+ implementation 'com.google.android.material:material:1.7.0'
28+ implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
2829 implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
2930
3031 api files('libs/olycamerakit.jar')
31- implementation "androidx.core:core-ktx:1.7.0"
32+ implementation "androidx.core:core-ktx:1.9.0"
3233 //implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
3334 }
3435 repositories {
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
11 <?xml version="1.0" encoding="utf-8"?>
2-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3- package="net.osdn.gokigen.a01d">
2+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43
54 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
65 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,13 @@
11 // Top-level build file where you can add configuration options common to all sub-projects/modules.
22
33 buildscript {
4- ext.kotlin_version = '1.6.10'
4+ ext.kotlin_version = '1.7.21'
55 repositories {
66 google()
77 mavenCentral()
88 }
99 dependencies {
10- classpath 'com.android.tools.build:gradle:7.1.1'
10+ classpath 'com.android.tools.build:gradle:7.4.0'
1111 classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212
1313 // NOTE: Do not place your application dependencies here; they belong
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
11 #Sun Feb 20 00:42:52 JST 2022
22 distributionBase=GRADLE_USER_HOME
3-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
3+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
44 distributionPath=wrapper/dists
55 zipStorePath=wrapper/dists
66 zipStoreBase=GRADLE_USER_HOME
Afficher sur ancien navigateur de dépôt.