Skip to content

Commit 50ce574

Browse files
refactor: Update app configurations and target SDK
- Updated the target SDK to 36. - Removed manifest placeholders for analytics and ad storage, as these are now handled directly in `AndroidManifest.xml`. - Added new AdMob and Firebase Performance metadata to `AndroidManifest.xml`. - Ensured Google Analytics screen reporting and storage are enabled by default. - Set ad user data and personalization signals to follow `eu_consent_policy`.
1 parent 4ed212c commit 50ce574

File tree

3 files changed

+42
-40
lines changed

3 files changed

+42
-40
lines changed

.idea/workspace.xml

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

app/build.gradle

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,13 @@ android {
1111
defaultConfig {
1212
applicationId 'com.d4rk.androidtutorials.java'
1313
minSdk 23
14-
targetSdk 35
14+
targetSdk 36
1515
versionCode 35
1616
versionName '5.0.1'
1717
archivesBaseName = "${applicationId}-v${versionName}"
1818
vectorDrawables.useSupportLibrary = true
1919
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
2020
resourceConfigurations += ['en', 'de', 'es', 'fr', 'hi', 'hu', 'in', 'it', 'ja', 'ro', 'ru', 'tr', 'sv', 'bg', 'pl', 'uk']
21-
manifestPlaceholders = [
22-
analyticsStorage: true,
23-
adStorage: true,
24-
adUserData: true,
25-
adPersonalization: true
26-
]
2721
}
2822

2923
buildTypes {
@@ -33,23 +27,11 @@ android {
3327
shrinkResources true
3428
debuggable false
3529
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
36-
manifestPlaceholders = [
37-
analyticsStorage: true,
38-
adStorage: true,
39-
adUserData: true,
40-
adPersonalization: true
41-
]
4230
}
4331
debug {
4432
multiDexEnabled true
4533
debuggable true
4634
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
47-
manifestPlaceholders = [
48-
analyticsStorage: false,
49-
adStorage: false,
50-
adUserData: false,
51-
adPersonalization: false
52-
]
5335
}
5436
}
5537

app/src/main/AndroidManifest.xml

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -317,24 +317,43 @@
317317
</service>
318318

319319
<meta-data
320-
android:name="firebase_performance_logcat_enabled"
320+
android:name="com.google.android.gms.version"
321+
android:value="@integer/google_play_services_version" />
322+
323+
<meta-data
324+
android:name="com.google.android.gms.ads.flag.OPTIMIZE_INITIALIZATION"
321325
android:value="true" />
322326

323327
<meta-data
324-
android:name="com.google.android.gms.version"
325-
android:value="@integer/google_play_services_version" />
328+
android:name="com.google.android.gms.ads.flag.OPTIMIZE_AD_LOADING"
329+
android:value="true" />
330+
331+
<meta-data
332+
android:name="com.google.android.gms.ads.AD_MANAGER_APP"
333+
android:value="true" />
326334

327335
<meta-data
328336
android:name="com.google.android.gms.ads.APPLICATION_ID"
329337
android:value="ca-app-pub-5294151573817700~1436412543" />
330338

331339
<meta-data
332-
android:name="com.google.android.gms.ads.AD_MANAGER_APP"
340+
android:name="firebase_performance_logcat_enabled"
333341
android:value="true" />
334342

335-
<meta-data android:name="google_analytics_default_allow_analytics_storage" android:value="${analyticsStorage}" />
336-
<meta-data android:name="google_analytics_default_allow_ad_storage" android:value="${adStorage}" />
337-
<meta-data android:name="google_analytics_default_allow_ad_user_data" android:value="${adUserData}" />
338-
<meta-data android:name="google_analytics_default_allow_ad_personalization_signals" android:value="${adPersonalization}" />
343+
<meta-data android:name="google_analytics_automatic_screen_reporting_enabled"
344+
android:value="true" />
345+
346+
<meta-data
347+
android:name="google_analytics_default_allow_analytics_storage"
348+
android:value="true" />
349+
<meta-data
350+
android:name="google_analytics_default_allow_ad_storage"
351+
android:value="true" />
352+
<meta-data
353+
android:name="google_analytics_default_allow_ad_user_data"
354+
android:value="eu_consent_policy" />
355+
<meta-data
356+
android:name="google_analytics_default_allow_ad_personalization_signals"
357+
android:value="eu_consent_policy" />
339358
</application>
340359
</manifest>

0 commit comments

Comments
 (0)