Replace spoon with composer

This commit is contained in:
ligi 2019-10-30 01:40:08 +09:00
parent e187c5999a
commit 4efab4213e
No known key found for this signature in database
GPG key ID: 8E81894010ABF23D
3 changed files with 3 additions and 21 deletions

View file

@ -3,7 +3,7 @@
"type": "android", "type": "android",
"stages": [ "stages": [
{ {
"name": "spoon", "name": "testWithMapsWithAnalyticsForPlayDebugComposer",
"needsEmulator": true "needsEmulator": true
}, },
{ {

View file

@ -1,5 +1,5 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'com.jaredsburrows.spoon' apply plugin: 'com.trevjonez.composer'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-kapt'
@ -12,7 +12,6 @@ repositories {
mavenLocal() mavenLocal()
google() google()
maven { url 'https://www.jitpack.io' } maven { url 'https://www.jitpack.io' }
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } // For Spoon snapshot, until 2.0.0 is released
} }
android { android {
@ -64,13 +63,6 @@ android {
} }
// hacky workaround to add spoon task that executes all variants
task spoon {
dependsOn {
tasks.findAll { task -> task.name != 'spoon' && task.name.startsWith('spoon') }
}
}
android.variantFilter { variant -> android.variantFilter { variant ->
def maps = variant.getFlavors().get(0).name def maps = variant.getFlavors().get(0).name
def analytics = variant.getFlavors().get(1).name def analytics = variant.getFlavors().get(1).name
@ -121,8 +113,6 @@ dependencies {
implementation 'com.github.salomonbrys.kodein:kodein:4.1.0' implementation 'com.github.salomonbrys.kodein:kodein:4.1.0'
compileOnly 'org.glassfish:javax.annotation:3.1.1' compileOnly 'org.glassfish:javax.annotation:3.1.1'
// spoon snapshot, until 2.0.0 is released
androidTestImplementation 'com.squareup.spoon:spoon-client:2.0.0-SNAPSHOT'
androidTestImplementation 'com.github.ligi:trulesk:0.28' androidTestImplementation 'com.github.ligi:trulesk:0.28'
androidTestImplementation 'androidx.test:core:1.2.0' androidTestImplementation 'androidx.test:core:1.2.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.ext:junit:1.1.1'
@ -194,12 +184,6 @@ dependencies {
withMapsImplementation 'com.google.android.gms:play-services-maps:16.1.0' withMapsImplementation 'com.google.android.gms:play-services-maps:16.1.0'
} }
spoon {
debug = true
grantAll = true
baseOutputDir = "build/spoon"
}
play { play {
jsonFile = file('/media/ligi/USBCRED/play.json') jsonFile = file('/media/ligi/USBCRED/play.json')
uploadImages = true uploadImages = true

View file

@ -8,14 +8,12 @@ buildscript {
jcenter() jcenter()
google() google()
maven { url 'https://www.jitpack.io' } maven { url 'https://www.jitpack.io' }
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } // for Spoon snapshot, until 2.0.0 is released
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.android.tools.build:gradle:3.5.1' classpath 'com.android.tools.build:gradle:3.5.1'
// FIXME: this causes deprecation warnings and should be replaced classpath 'com.github.trevjonez.composer-gradle-plugin:plugin:0.13.1'
classpath 'com.jaredsburrows:gradle-spoon-plugin:1.5.0'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.27.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.27.0'
classpath 'de.mobilej.unmock:UnMockPlugin:0.6.5' classpath 'de.mobilej.unmock:UnMockPlugin:0.6.5'
classpath 'com.github.triplet.gradle:play-publisher:1.1.5' classpath 'com.github.triplet.gradle:play-publisher:1.1.5'