ビルドのバージョンを更新する。

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d19981..f3d13dd 100644 (file)
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -27,17 +27,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <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">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

diff --git a/app/build.gradle b/app/build.gradle
index 7328ebf..830e99e 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "26.0.1"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.0"
     defaultConfig {
         applicationId "jp.sfjp.gokigen.a01c"
         minSdkVersion 14
-        targetSdkVersion 25
-        versionCode 27
-        versionName "1.2.5"
+        targetSdkVersion 27
+        versionCode 29
+        versionName "1.2.6"
     }
     buildTypes {
         release {
@@ -16,6 +16,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+/*
     productFlavors {
         wear1 {
             // Use the defaultConfig value
@@ -25,20 +26,21 @@ android {
             minSdkVersion 23
         }
     }
+*/
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     wearApp project(path: ':wear')
-    provided 'com.google.android.wearable:wearable:2.0.2'
-    compile 'com.google.android.support:wearable:2.0.2'
-    compile 'com.google.android.gms:play-services-wearable:11.0.4'
+    provided 'com.google.android.wearable:wearable:2.1.0'
+    compile 'com.google.android.support:wearable:2.1.0'
+    compile 'com.google.android.gms:play-services-wearable:11.4.2'
 
-    compile 'com.android.support:animated-vector-drawable:25.3.1'
-    compile 'com.android.support:percent:25.3.1'
-    compile 'com.android.support:support-vector-drawable:25.3.1'
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:preference-v7:25.3.1'
-    compile 'com.android.support:exifinterface:25.3.1'
-    compile 'com.android.support:support-v4:25.3.1'
+    compile 'com.android.support:animated-vector-drawable:27.0.0'
+    compile 'com.android.support:percent:27.0.0'
+    compile 'com.android.support:support-vector-drawable:27.0.0'
+    compile 'com.android.support:appcompat-v7:27.0.0'
+    compile 'com.android.support:preference-v7:27.0.0'
+    compile 'com.android.support:exifinterface:27.0.0'
+    compile 'com.android.support:support-v4:27.0.0'
 }

diff --git a/build.gradle b/build.gradle
index c2eea8e..5f57b73 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +15,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6d202f5..e961de2 100644 (file)
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Mar 04 00:10:34 JST 2017
+#Sat Oct 28 22:17:19 JST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

diff --git a/wear/build.gradle b/wear/build.gradle
index 02661e7..82da714 100644 (file)
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "26.0.1"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.0"
     defaultConfig {
         applicationId "jp.sfjp.gokigen.a01c"
         minSdkVersion 23
-        targetSdkVersion 25
-        versionCode 28
-        versionName "1.2.5"
+        targetSdkVersion 27
+        versionCode 30
+        versionName "1.2.6"
     }
     buildTypes {
         release {
@@ -21,17 +21,17 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
 
-    provided 'com.google.android.wearable:wearable:2.0.2'
-    compile 'com.google.android.support:wearable:2.0.2'
-    compile 'com.google.android.gms:play-services-wearable:11.0.4'
+    provided 'com.google.android.wearable:wearable:2.1.0'
+    compile 'com.google.android.support:wearable:2.1.0'
+    compile 'com.google.android.gms:play-services-wearable:11.4.2'
 
     //compile 'com.android.support:wear:26.0.0'
-    compile 'com.android.support:animated-vector-drawable:25.3.1'
-    compile 'com.android.support:percent:25.3.1'
-    compile 'com.android.support:support-vector-drawable:25.3.1'
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:preference-v7:25.3.1'
-    compile 'com.android.support:exifinterface:25.3.1'
-    compile 'com.android.support:support-v4:25.3.1'
+    compile 'com.android.support:animated-vector-drawable:27.0.0'
+    compile 'com.android.support:percent:27.0.0'
+    compile 'com.android.support:support-vector-drawable:27.0.0'
+    compile 'com.android.support:appcompat-v7:27.0.0'
+    compile 'com.android.support:preference-v7:27.0.0'
+    compile 'com.android.support:exifinterface:27.0.0'
+    compile 'com.android.support:support-v4:27.0.0'
     compile files('libs/olycamerakit.jar')
 }