• R/O
  • HTTP
  • SSH
  • HTTPS

コミット

タグ
未設定

よく使われているワード(クリックで追加)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

コミットメタ情報

リビジョン8a4d151dc5a0fc16af69b99c4a0a163162d86932 (tree)
日時2018-04-13 18:35:07
作者HMML <hmml3939@gmai...>
コミッターHMML

ログメッセージ

Update tools to current version.

変更サマリ

差分

--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
22 .gradle
33 /local.properties
44 /.idea/workspace.xml
5+/.idea/caches/
56 /.idea/libraries
67 .DS_Store
78 /build
@@ -14,5 +15,6 @@
1415 *.orig
1516 *.rej
1617
18+
1719 # release apk
1820 /app/app-release.apk
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,29 @@
1+<component name="ProjectCodeStyleConfiguration">
2+ <code_scheme name="Project" version="173">
3+ <Objective-C-extensions>
4+ <file>
5+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
6+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
7+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
8+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
9+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
10+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
11+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
12+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
13+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
14+ </file>
15+ <class>
16+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
17+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
18+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
19+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
20+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
21+ <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
22+ </class>
23+ <extensions>
24+ <pair source="cpp" header="h" fileNamingConvention="NONE" />
25+ <pair source="c" header="h" fileNamingConvention="NONE" />
26+ </extensions>
27+ </Objective-C-extensions>
28+ </code_scheme>
29+</component>
\ No newline at end of file
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
11 <?xml version="1.0" encoding="UTF-8"?>
22 <project version="4">
3- <component name="EntryPointsManager">
4- <entry_points version="2.0" />
5- </component>
63 <component name="NullableNotNullManager">
74 <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
85 <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -27,17 +24,7 @@
2724 </value>
2825 </option>
2926 </component>
30- <component name="ProjectLevelVcsManager" settingsEditedManually="false">
31- <OptionsSetting value="true" id="Add" />
32- <OptionsSetting value="true" id="Remove" />
33- <OptionsSetting value="true" id="Checkout" />
34- <OptionsSetting value="true" id="Update" />
35- <OptionsSetting value="true" id="Status" />
36- <OptionsSetting value="true" id="Edit" />
37- <ConfirmationsSetting value="0" id="Add" />
38- <ConfirmationsSetting value="0" id="Remove" />
39- </component>
40- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
27+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
4128 <output url="file://$PROJECT_DIR$/build/classes" />
4229 </component>
4330 <component name="ProjectType">
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22
33 android {
44 compileSdkVersion 25
5- buildToolsVersion "25.0.2"
5+ buildToolsVersion '27.0.3'
66 defaultConfig {
77 applicationId "cloud.hmml.mmw"
88 minSdkVersion 17
@@ -23,17 +23,17 @@ android {
2323 }
2424
2525 dependencies {
26- //compile 'com.android.support:multidex:1.0.0'
27- compile fileTree(include: ['*.jar'], dir: 'libs')
28- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
26+ //api 'com.android.support:multidex:1.0.0'
27+ api fileTree(include: ['*.jar'], dir: 'libs')
28+ androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
2929 exclude group: 'com.android.support', module: 'support-annotations'
3030 })
31- compile 'com.android.support:appcompat-v7:25.1.0'
32- compile 'com.google.android.gms:play-services-location:8.4.0'
33- compile 'com.koushikdutta.ion:ion:2.+'
34- compile 'com.android.support:design:25.3.1'
35- compile 'com.android.support.constraint:constraint-layout:1.0.2'
36- compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
37- compile 'commons-io:commons-io:2.5'
38- testCompile 'junit:junit:4.12'
31+ api 'com.android.support:appcompat-v7:25.1.0'
32+ api 'com.google.android.gms:play-services-location:8.4.0'
33+ api 'com.koushikdutta.ion:ion:2.+'
34+ api 'com.android.support:design:25.3.1'
35+ api 'com.android.support.constraint:constraint-layout:1.0.2'
36+ api 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
37+ api 'commons-io:commons-io:2.5'
38+ //testApi 'junit:junit:4.12'
3939 }
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,14 @@
33 buildscript {
44 repositories {
55 jcenter()
6+ maven {
7+ url 'https://maven.google.com/'
8+ name 'Google'
9+ }
10+ google()
611 }
712 dependencies {
8- classpath 'com.android.tools.build:gradle:2.3.3'
13+ classpath 'com.android.tools.build:gradle:3.1.1'
914
1015 // NOTE: Do not place your application dependencies here; they belong
1116 // in the individual module build.gradle files
@@ -15,6 +20,10 @@ buildscript {
1520 allprojects {
1621 repositories {
1722 jcenter()
23+ maven {
24+ url 'https://maven.google.com/'
25+ name 'Google'
26+ }
1827 }
1928 }
2029
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
1-#Fri Jan 13 22:27:23 JST 2017
1+#Fri Apr 13 17:49:24 JST 2018
22 distributionBase=GRADLE_USER_HOME
33 distributionPath=wrapper/dists
44 zipStoreBase=GRADLE_USER_HOME
55 zipStorePath=wrapper/dists
6-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
6+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip