バージョンをモジュール間で統一

kght6123 · Aug 20, 2018 · f8d145a · f8d145a
1 parent 02e643a
commit f8d145a
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 16 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
@@ -1,2 +1,2 @@
-#Tue Jan 02 15:57:06 JST 2018
 connection.project.dir=
+eclipse.preferences.version=1
diff --git a/README.md b/README.md
@@ -93,7 +93,7 @@ FrameworkライブラリはGitPagesの仮Mavenリポジトリで公開。
         maven { url 'http://kght6123.github.io/maven-repositories/android' }
     }
     dependencies {
-        compile 'jp.kght6123.floating.window:floating-window-framework:0.0.1'
+        compile 'jp.kght6123.floating.window:floating-window-framework:latest'
     }
     ```
 

diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,17 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.51'
+    ext.kotlin_version = '1.2.60'
     ext.kotlinx_coroutines_version = '0.16'
     ext.android_support_version = '27.1.1'
     ext.constraint_layout_version = '1.1.2'
     ext.anko_version='0.10.3'
     ext.gradle_version='3.3.0-alpha03'
+    ext.version_code="3"
+    ext.version_name="0.3.0"
+    ext.maven_repo_version="0.3.0"
+    ext.espresso_core_version="3.0.1"
+    ext.junit_version="4.12"
     repositories {
         jcenter()
         google()

diff --git a/download/floating-window-core-debug.apk b/download/floating-window-core-debug.apk
diff --git a/download/floating-window-core-release-unsigned.apk b/download/floating-window-core-release-unsigned.apk
diff --git a/floating-window-core/build.gradle b/floating-window-core/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId 'jp.kght6123.floating.window.core'
         minSdkVersion 23
         targetSdkVersion 27
-        versionCode 2
+        versionCode Integer.decode("$version_code")
-        versionName "1.1"
+        versionName "$version_name"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -36,7 +36,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
+    androidTestImplementation("com.android.support.test.espresso:espresso-core:$espresso_core_version", {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
@@ -68,7 +68,7 @@ dependencies {
     implementation "org.jetbrains.anko:anko-support-v4-commons:$anko_version"// Support-v4 (only Anko Commons)
     implementation "org.jetbrains.anko:anko-support-v4:$anko_version"// Support-v4 (Anko Layouts)
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation "junit:junit:$junit_version"
     implementation project(path: ':floating-window-framework')
 }
 repositories {

diff --git a/floating-window-framework/build.gradle b/floating-window-framework/build.gradle
@@ -7,7 +7,7 @@ uploadArchives {
         // Mavenリポジトリを作成
         mavenDeployer {
             repository url: "file://$buildDir/../../../maven-repositories/android"
-            pom.version = "0.0.2"
+            pom.version = "$maven_repo_version"
             pom.groupId = "jp.kght6123.floating.window"
             pom.artifactId = "floating-window-framework"
         }
@@ -20,8 +20,8 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 27
-        versionCode 2
+        versionCode Integer.decode("$version_code")
-        versionName "1.1"
+        versionName "$version_name"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -49,7 +49,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
+    androidTestImplementation("com.android.support.test.espresso:espresso-core:$espresso_core_version", {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
@@ -81,7 +81,7 @@ dependencies {
     implementation "org.jetbrains.anko:anko-support-v4-commons:$anko_version"// Support-v4 (only Anko Commons)
     implementation "org.jetbrains.anko:anko-support-v4:$anko_version"// Support-v4 (Anko Layouts)
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation "junit:junit:$junit_version"
 }
 repositories {
     mavenCentral()

diff --git a/floating-window-sample/build.gradle b/floating-window-sample/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "jp.kght6123.floating.window.sample"
         minSdkVersion 23
         targetSdkVersion 27
-        versionCode 2
+        versionCode Integer.decode("$version_code")
-        versionName "1.1"
+        versionName "$version_name"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -36,7 +36,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
+    androidTestImplementation("com.android.support.test.espresso:espresso-core:$espresso_core_version", {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
@@ -68,7 +68,7 @@ dependencies {
     implementation "org.jetbrains.anko:anko-support-v4-commons:$anko_version"// Support-v4 (only Anko Commons)
     implementation "org.jetbrains.anko:anko-support-v4:$anko_version"// Support-v4 (Anko Layouts)
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation "junit:junit:$junit_version"
     implementation project(path: ':floating-window-framework')
 }
 repositories {