Skip to content

Commit 195b775

Browse files
authoredOct 2, 2020
Updates all samples to alpha04 (except JetNews and Crane) and to AGP alpha13.
Android Studio 4.2. canary 13 is required to use these samples.
2 parents cbede8b + 2401604 commit 195b775

File tree

82 files changed

+851
-627
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+851
-627
lines changed
 

‎Crane/app/build.gradle

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,28 @@ android {
4040

4141
manifestPlaceholders = [ googleMapsKey : properties.getProperty("google.maps.key", "") ]
4242
}
43+
44+
signingConfigs {
45+
// We use a bundled debug keystore, to allow debug builds from CI to be upgradable
46+
debug {
47+
storeFile rootProject.file('debug.keystore')
48+
storePassword 'android'
49+
keyAlias 'androiddebugkey'
50+
keyPassword 'android'
51+
}
52+
}
53+
4354
buildTypes {
55+
debug {
56+
signingConfig signingConfigs.debug
57+
}
58+
4459
release {
4560
minifyEnabled false
4661
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
4762
}
4863
}
64+
4965
compileOptions {
5066
sourceCompatibility JavaVersion.VERSION_1_8
5167
targetCompatibility JavaVersion.VERSION_1_8

‎Crane/build.gradle

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,18 @@ subprojects {
6969
freeCompilerArgs += '-Xallow-jvm-ir-dependencies'
7070
}
7171
}
72-
}
72+
73+
// Crane uses Compose alpha03 and Android Gradle Plugin 4.2.0-alpha13 which are incompatible
74+
// TODO: Remove this workaround when updating to >alpha04
75+
configurations.configureEach {
76+
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
77+
def group = details.requested.group
78+
def module = details.requested.module.name
79+
def version = details.requested.version
80+
81+
if (group == 'androidx.compose.compiler' && module == 'compiler') {
82+
details.useTarget("androidx.compose:compose-compiler:$version")
83+
}
84+
}
85+
}
86+
}

0 commit comments

Comments
 (0)