add setting playaccountconfig

MKailani · Jan 31, 2018 · b6551a0 · b6551a0
1 parent 6cf518f
commit b6551a0
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 41 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -17,33 +17,22 @@ val versionPatch = 0
 
 plugins {
     id("com.android.application") version Versions.gradleBuildTool
+    id("com.google.gms.oss.licenses.plugin") version Versions.ossLicenses
+    id("com.google.gms.google-services") version Versions.googleServices apply false
     kotlin("android") version Versions.kotlin
     kotlin("kapt") version Versions.kotlin
+    id("com.github.ben-manes.versions") version Versions.gradleVersions
+    id("com.github.triplet.play") version Versions.playPublisher
     id("org.jlleitschuh.gradle.ktlint") version Versions.ktlintGradle
     id("io.fabric") version Versions.fabricGradleTool
-    id("com.google.gms.oss.licenses.plugin") version Versions.ossLicenses
-    id("com.github.ben-manes.versions") version Versions.gradleVersions
     id("deploygate") version Versions.deploygate
-    id("com.github.triplet.play") version Versions.playPublisher
-    id("com.google.gms.google-services") version Versions.googleServices apply false
 }
 
 android {
     compileSdkVersion(Versions.compileSdk)
     buildToolsVersion(Versions.buildTools)
     dataBinding.isEnabled = true
 
-    // Play publisher
-    //TODO playAccountConfigs を直接かけないので追加する必要がある
-    container(PlayAccountConfig::class.java).create("playAccountConfigs") {
-        jsonFile = file("publisher-keys.json")
-    }
-//    playAccountConfigs.defaultAccountConfig {
-//        // TODO Replace json file to the one which is generated in the API console.
-//        // https://github.com/Triple-T/gradle-play-publisher#authentication
-//        jsonFile = file("publisher-keys.json")
-//    }
-
     defaultConfig {
         applicationId = "io.github.droidkaigi.confsched2018"
         minSdkVersion(Versions.minSdk)
@@ -54,7 +43,13 @@ android {
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true
         resConfigs("en", "ja")
-//        playAccountConfig = playAccountConfigs.defaultAccountConfig
+
+        // Play publisher
+        // TODO Replace json file to the one which is generated in the API console.
+        // https://github.com/Triple-T/gradle-play-publisher#authentication
+        ext["playAccountConfig"] = PlayAccountConfig("playAccountConfigs").apply {
+            jsonFile = file("publisher-keys.json")
+        }
 
         javaCompileOptions {
             annotationProcessorOptions {
@@ -248,10 +243,10 @@ deploygate {
     apks {
         create("release") {
             val hash = Runtime.getRuntime().exec("git rev-parse --short HEAD")
-            message = "https://github.com/DroidKaigi/conference-app-2018/tree/${hash} ${System.getenv("CIRCLE_BUILD_URL")}"
+            message = "https://github.com/DroidKaigi/conference-app-2018/tree/$hash ${System.getenv("CIRCLE_BUILD_URL")}"
 
             distributionKey = "aed2445665e27de6571227992d66ea489b6bdb44"
-            releaseNote = "https://github.com/DroidKaigi/conference-app-2018/tree/${hash} ${System.getenv("CIRCLE_BUILD_URL")}"
+            releaseNote = "https://github.com/DroidKaigi/conference-app-2018/tree/$hash ${System.getenv("CIRCLE_BUILD_URL")}"
         }
     }
 }

diff --git a/model/build.gradle.kts b/model/build.gradle.kts
@@ -5,29 +5,26 @@ import org.gradle.kotlin.dsl.repositories
 import org.gradle.kotlin.dsl.version
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-val kotlin_version: String by extra
 buildscript {
-    var kotlin_version: String by extra
-    kotlin_version = "1.2.20"
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath(kotlinModule("gradle-plugin", kotlin_version))
+        classpath(kotlin("gradle-plugin", Versions.kotlin))
     }
 }
 
 plugins {
     id("java-library")
-    kotlin("jvm") version "1.2.20"
+    kotlin("jvm") version Versions.kotlin
 }
 apply {
     plugin("kotlin")
 }
 
 dependencies {
     kotlin("stdlib-jre7", "1.2.20")
-    compile(kotlinModule("stdlib-jdk8", kotlin_version))
+    compile(kotlin("stdlib-jdk8", Versions.kotlin))
 }
 
 java {

diff --git a/settings.gradle b/settings.gradle
@@ -10,35 +10,29 @@ pluginManagement {
     resolutionStrategy {
         eachPlugin {
             switch (requested.id.id) {
-                case 'kotlin-android':
-                    useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${requested.version}")
-                    break
-                case 'kotlin-kapt':
-                    useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${requested.version}")
-                    break
-                case "org.jlleitschuh.gradle.ktlint":
-                    useModule("gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:${requested.version}")
+                case "com.android.application":
+                    useModule("com.android.tools.build:gradle:${requested.version}")
                     break
-                case 'io.fabric':
-                    useModule("io.fabric.tools:gradle:${requested.version}")
+                case "com.google.gms.google-services":
+                    useModule("com.google.gms:google-services:${requested.version}")
                     break
                 case 'com.google.gms.oss.licenses.plugin':
                     useModule("com.google.gms:oss-licenses:${requested.version}")
                     break
                 case 'com.github.ben-manes.versions':
                     useModule("com.github.ben-manes:gradle-versions-plugin:${requested.version}")
                     break
-                case 'deploygate':
-                    useModule("com.deploygate:gradle:${requested.version}")
-                    break
                 case 'com.github.triplet.play':
                     useModule("com.github.triplet.gradle:play-publisher:${requested.version}")
                     break
-                case "com.android.application":
-                    useModule("com.android.tools.build:gradle:${requested.version}")
+                case "org.jlleitschuh.gradle.ktlint":
+                    useModule("gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:${requested.version}")
                     break
-                case "com.google.gms.google-services":
-                    useModule("com.google.gms:google-services:${requested.version}")
+                case 'io.fabric':
+                    useModule("io.fabric.tools:gradle:${requested.version}")
+                    break
+                case 'deploygate':
+                    useModule("com.deploygate:gradle:${requested.version}")
                     break
             }
         }