Skip to content

Commit 0d131ef

Browse files
committed
revert: restore settings-kits.gradle rename pattern
Keep kit registration unchanged and rely on the existing android- rename so example modules and CI matrix paths continue to resolve correctly.
1 parent 45d9908 commit 0d131ef

4 files changed

Lines changed: 33 additions & 37 deletions

File tree

kits/adjust/adjust-5/example/example-java/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ android {
2727
}
2828

2929
dependencies {
30-
implementation project(':kits:android-adjust:adjust-5')
30+
implementation project(':kits:adjust:adjust-5')
3131
implementation 'androidx.appcompat:appcompat:1.6.1'
3232
implementation 'com.google.android.material:material:1.11.0'
3333
}

kits/adjust/adjust-5/example/example-kotlin/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232
}
3333

3434
dependencies {
35-
implementation project(':kits:android-adjust:adjust-5')
35+
implementation project(':kits:adjust:adjust-5')
3636
implementation 'androidx.appcompat:appcompat:1.6.1'
3737
implementation 'com.google.android.material:material:1.11.0'
3838
}

settings-kit-examples.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// CI-only settings for kit sample apps. Keeps example modules out of settings-kits.gradle.
22
apply from: 'settings-kits.gradle'
33

4-
include ':kits:android-adjust:adjust-5:example-kotlin',
5-
':kits:android-adjust:adjust-5:example-java'
4+
include ':kits:adjust:adjust-5:example-kotlin',
5+
':kits:adjust:adjust-5:example-java'
66

7-
project(':kits:android-adjust:adjust-5:example-kotlin').projectDir = file('kits/adjust/adjust-5/example/example-kotlin')
8-
project(':kits:android-adjust:adjust-5:example-java').projectDir = file('kits/adjust/adjust-5/example/example-java')
7+
project(':kits:adjust:adjust-5:example-kotlin').projectDir = file('kits/adjust/adjust-5/example/example-kotlin')
8+
project(':kits:adjust:adjust-5:example-java').projectDir = file('kits/adjust/adjust-5/example/example-java')

settings-kits.gradle

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,35 @@
11
//keep things alphabetical like readme
22

33
include (
4-
':kits:android-adjust:adjust-5',
5-
':kits:android-adobe:adobe-5',
6-
':kits:android-adobemedia:adobemedia-5',
7-
':kits:android-appsflyer:appsflyer-6',
8-
':kits:android-apptentive:apptentive-6',
9-
':kits:android-apptimize:apptimize-3',
4+
':kits:adjust:adjust-5',
5+
':kits:adobe:adobe-5',
6+
':kits:adobemedia:adobemedia-5',
7+
':kits:appsflyer:appsflyer-6',
8+
':kits:apptentive:apptentive-6',
9+
':kits:apptimize:apptimize-3',
1010
//blueshift hosts kit
11-
':kits:android-braze:braze-38',
12-
':kits:android-braze:braze-39',
13-
':kits:android-braze:braze-40',
14-
':kits:android-braze:braze-41',
15-
':kits:android-branch:branch-5',
16-
':kits:android-clevertap:clevertap-7',
17-
':kits:android-comscore:comscore-6',
18-
':kits:android-ga:ga-23',
19-
':kits:android-ga4:ga4-23',
20-
':kits:android-iterable:iterable-3',
21-
':kits:android-kochava:kochava-5',
22-
':kits:android-localytics:localytics-6',
23-
':kits:android-leanplum:leanplum-7',
11+
':kits:braze:braze-38',
12+
':kits:braze:braze-39',
13+
':kits:braze:braze-40',
14+
':kits:braze:braze-41',
15+
':kits:branch:branch-5',
16+
':kits:clevertap:clevertap-7',
17+
':kits:comscore:comscore-6',
18+
':kits:ga:ga-23',
19+
':kits:ga4:ga4-23',
20+
':kits:iterable:iterable-3',
21+
':kits:kochava:kochava-5',
22+
':kits:localytics:localytics-6',
23+
':kits:leanplum:leanplum-7',
2424
//Neura hosts kit
25-
':kits:android-onetrust:onetrust',
26-
':kits:android-optimizely:optimizely-3',
27-
':kits:android-radar:radar-3',
28-
':kits:android-rokt:rokt',
29-
':kits:android-singular:singular-12',
25+
':kits:onetrust:onetrust',
26+
':kits:optimizely:optimizely-3',
27+
':kits:radar:radar-3',
28+
':kits:rokt:rokt',
29+
':kits:singular:singular-12',
3030
//Swrve hosts kit
31-
// ':kits:android-urbanairship:urbanairship-20', // Kotlin 2.2.x -- built standalone (see ONBOARDING.md)
31+
// ':kits:urbanairship:urbanairship-20', // Kotlin 2.2.x -- built standalone (see ONBOARDING.md)
3232
)
33-
34-
project(':kits').getChildren().each { vendorProject ->
35-
def diskVendorName = vendorProject.name - 'android-'
36-
vendorProject.children.each { kitProject ->
37-
kitProject.projectDir = file("kits/${diskVendorName}/${kitProject.name}")
38-
}
33+
project(':kits').getChildren().each {
34+
proj -> proj.name = 'android-' + proj.name
3935
}

0 commit comments

Comments
 (0)