Skip to content

Commit 4715038

Browse files
committed
1.4.04
1 parent dca2466 commit 4715038

File tree

7 files changed

+651
-5326
lines changed

7 files changed

+651
-5326
lines changed

.idea/deploymentTargetDropDown.xml

Lines changed: 14 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Makefile

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,26 @@ build-and-publish-to-test-track:
4949
@./gradlew publishBundle --track internal --console verbose
5050

5151
build-and-publish:
52-
@echo -e "Retrieved Version: ${VERSION}\n\n Hit enter if you have\n 1. Incremented the version\n 2. Updated the release notes\n 3. Pushed the latest changes\n\n Otherwise cancel target now."
53-
@read
52+
@echo -e "Retrieved Version: ${VERSION}\n\n Hit enter if you have\n 1. Incremented the version\n 2. Updated the release notes\n\n Otherwise cancel target now."
53+
@read
54+
55+
@echo "Lint"
56+
@$(MAKE) lint
5457

5558
@$(MAKE) clean # Required as 'publishBundle' publishes all .aab's in archive dir
5659

57-
@$(MAKE) baseline-profile
60+
@#$(MAKE) baseline-profile
61+
62+
@echo "Pushing latest changes";git add .;git commit -m "${VERSION}";git push
63+
5864
@$(MAKE) build-aab
5965
@$(MAKE) build-apk
6066

61-
@$(MAKE) create-gh-release
6267
@echo "Publish Bundle"
6368
@./gradlew publishBundle --track production --console verbose --no-configuration-cache # usage of configuration cache throws error for task
6469

70+
@$(MAKE) create-gh-release
71+
6572
create-gh-release:
6673
@echo "Create GitHub Release"
6774
@gh release create $(VERSION) app/build/outputs/apk/release/$(VERSION).apk -F app/src/main/play/release-notes/en-US/production.txt

app/lint.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<lint>
3-
<issue id="NotificationPermission" severity="ignore" />
4-
<issue id="ComposeCompositionLocalUsage">
5-
<option name="allowed-composition-locals"
6-
value="LocalSnackbarHostState,LocalLocationManager" />
7-
</issue>
3+
<!--Allow CompositionLocal's-->
4+
<issue id="ComposeCompositionLocalUsage" severity="ignore" />
5+
<issue id="NotificationPermission" severity="warning" />
6+
<issue id="LintError" severity="warning" />
87
</lint>
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
- Performance improvements
1+
- Performance improvements
2+
- UI adjustments

app/src/release/generated/baselineProfiles/baseline-prof.txt

Lines changed: 300 additions & 2655 deletions
Large diffs are not rendered by default.

app/src/release/generated/baselineProfiles/startup-prof.txt

Lines changed: 300 additions & 2655 deletions
Large diffs are not rendered by default.

benchmarking/build.gradle.kts

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.android.build.api.dsl.ManagedVirtualDevice
2+
13
plugins {
24
alias(libs.plugins.androidTest)
35
alias(libs.plugins.kotlin)
@@ -8,24 +10,37 @@ kotlin {
810
jvmToolchain(libs.versions.java.get().toInt())
911
}
1012

13+
val mvdName = "Pixel 6 API 33"
14+
1115
android {
1216
namespace = "com.w2sv.benchmarking"
13-
compileSdk = 34
17+
compileSdk = libs.versions.compileSdk.get().toInt()
1418

1519
defaultConfig {
1620
minSdk = 28
17-
targetSdk = 34
21+
targetSdk = libs.versions.compileSdk.get().toInt()
1822

1923
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2024
}
2125

26+
testOptions.managedDevices.devices {
27+
@Suppress("UnstableApiUsage")
28+
create<ManagedVirtualDevice>(mvdName) {
29+
device = "Pixel 6"
30+
apiLevel = 33
31+
systemImageSource = "aosp"
32+
}
33+
}
34+
2235
targetProjectPath = ":app"
2336
}
2437

25-
// This is the configuration block for the Baseline Profile plugin.
26-
// You can specify to run the generators on a managed devices or connected devices.
38+
// Baseline profile configuration: https://developer.android.com/topic/performance/baselineprofiles/configure-baselineprofiles
2739
baselineProfile {
28-
useConnectedDevices = true
40+
@Suppress("UnstableApiUsage")
41+
enableEmulatorDisplay = false
42+
useConnectedDevices = false
43+
managedDevices += mvdName
2944
}
3045

3146
dependencies {

0 commit comments

Comments
 (0)