OPC(Olympus Air)用望遠鏡アプリ。
Révision | 9b3d941a9a07114fe1ea29348f4562bd7ce534a6 (tree) |
---|---|
l'heure | 2023-01-19 23:29:46 |
Auteur | MRSa <mrsa@myad...> |
Commiter | MRSa |
最新SDKに更新。
@@ -1,24 +1,10 @@ | ||
1 | 1 | <component name="ProjectCodeStyleConfiguration"> |
2 | 2 | <code_scheme name="Project" version="173"> |
3 | 3 | <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" /> | |
20 | 5 | </JetCodeStyleSettings> |
21 | 6 | <codeStyleSettings language="XML"> |
7 | + <option name="FORCE_REARRANGE_MODE" value="1" /> | |
22 | 8 | <indentOptions> |
23 | 9 | <option name="CONTINUATION_INDENT_SIZE" value="4" /> |
24 | 10 | </indentOptions> |
@@ -130,5 +116,8 @@ | ||
130 | 116 | </rules> |
131 | 117 | </arrangement> |
132 | 118 | </codeStyleSettings> |
119 | + <codeStyleSettings language="kotlin"> | |
120 | + <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" /> | |
121 | + </codeStyleSettings> | |
133 | 122 | </code_scheme> |
134 | 123 | </component> |
\ No newline at end of file |
@@ -8,13 +8,13 @@ | ||
8 | 8 | <option name="testRunner" value="GRADLE" /> |
9 | 9 | <option name="distributionType" value="DEFAULT_WRAPPED" /> |
10 | 10 | <option name="externalProjectPath" value="$PROJECT_DIR$" /> |
11 | + <option name="gradleJvm" value="Embedded JDK" /> | |
11 | 12 | <option name="modules"> |
12 | 13 | <set> |
13 | 14 | <option value="$PROJECT_DIR$" /> |
14 | 15 | <option value="$PROJECT_DIR$/app" /> |
15 | 16 | </set> |
16 | 17 | </option> |
17 | - <option name="resolveModulePerSourceSet" value="false" /> | |
18 | 18 | </GradleProjectSettings> |
19 | 19 | </option> |
20 | 20 | </component> |
@@ -122,7 +122,7 @@ | ||
122 | 122 | </value> |
123 | 123 | </option> |
124 | 124 | </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"> | |
126 | 126 | <output url="file://$PROJECT_DIR$/build/classes" /> |
127 | 127 | </component> |
128 | 128 | <component name="ProjectType"> |
@@ -2,8 +2,11 @@ | ||
2 | 2 | <project version="4"> |
3 | 3 | <component name="ProjectModuleManager"> |
4 | 4 | <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" /> | |
6 | 6 | <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" /> | |
7 | 10 | </modules> |
8 | 11 | </component> |
9 | 12 | </project> |
\ No newline at end of file |
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application' | ||
2 | 2 | apply plugin: 'kotlin-android' |
3 | 3 | |
4 | 4 | android { |
5 | - compileSdkVersion 32 | |
5 | + compileSdkVersion 33 | |
6 | 6 | defaultConfig { |
7 | 7 | applicationId "net.osdn.gokigen.a01d" |
8 | 8 | minSdkVersion 14 |
9 | - targetSdkVersion 32 | |
10 | - versionCode 10908 | |
11 | - versionName "1.9.8" | |
9 | + targetSdkVersion 33 | |
10 | + versionCode 10909 | |
11 | + versionName "1.9.9" | |
12 | 12 | } |
13 | 13 | buildTypes { |
14 | 14 | release { |
@@ -16,19 +16,20 @@ android { | ||
16 | 16 | proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' |
17 | 17 | } |
18 | 18 | } |
19 | + namespace 'net.osdn.gokigen.a01d' | |
19 | 20 | } |
20 | 21 | |
21 | 22 | dependencies { |
22 | 23 | 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' | |
25 | 26 | 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' | |
28 | 29 | implementation 'androidx.vectordrawable:vectordrawable:1.1.0' |
29 | 30 | |
30 | 31 | api files('libs/olycamerakit.jar') |
31 | - implementation "androidx.core:core-ktx:1.7.0" | |
32 | + implementation "androidx.core:core-ktx:1.9.0" | |
32 | 33 | //implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" |
33 | 34 | } |
34 | 35 | repositories { |
@@ -1,6 +1,5 @@ | ||
1 | 1 | <?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"> | |
4 | 3 | |
5 | 4 | <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> |
6 | 5 | <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> |
@@ -1,13 +1,13 @@ | ||
1 | 1 | // Top-level build file where you can add configuration options common to all sub-projects/modules. |
2 | 2 | |
3 | 3 | buildscript { |
4 | - ext.kotlin_version = '1.6.10' | |
4 | + ext.kotlin_version = '1.7.21' | |
5 | 5 | repositories { |
6 | 6 | google() |
7 | 7 | mavenCentral() |
8 | 8 | } |
9 | 9 | dependencies { |
10 | - classpath 'com.android.tools.build:gradle:7.1.1' | |
10 | + classpath 'com.android.tools.build:gradle:7.4.0' | |
11 | 11 | classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" |
12 | 12 | |
13 | 13 | // NOTE: Do not place your application dependencies here; they belong |
@@ -1,6 +1,6 @@ | ||
1 | 1 | #Sun Feb 20 00:42:52 JST 2022 |
2 | 2 | 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 | |
4 | 4 | distributionPath=wrapper/dists |
5 | 5 | zipStorePath=wrapper/dists |
6 | 6 | zipStoreBase=GRADLE_USER_HOME |