Skip to content
This repository was archived by the owner on Apr 4, 2023. It is now read-only.

Commit b833b1b

Browse files
EddyVerbruggenEddyVerbruggen
committed
Migrade Android gradle 'compile' to 'implementation' #1139 
1 parent 1cf17cc commit b833b1b

File tree

3 files changed

+68
-83
lines changed

3 files changed

+68
-83
lines changed

‎.travis.yml‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,7 @@ matrix:
1010
node_js: "8"
1111
script: "npm run ci.tslint"
1212
- stage: "WebPack"
13-
os: osx
14-
env:
15-
- WebPack="iOS"
16-
osx_image: xcode10.0
17-
language: node_js
18-
node_js: "8"
19-
jdk: oraclejdk8
20-
before_install:
21-
- gem install cocoapods
22-
- pod repo update
23-
script: travis_wait travis_retry tns build ios --bundle
24-
- language: android
13+
language: android
2514
os: linux
2615
env:
2716
- WebPack="Android"
@@ -65,12 +54,12 @@ before_install:
6554
- sudo pip install six
6655

6756
install:
68-
- echo no | npm install -g nativescript
69-
- tns usage-reporting disable
70-
- tns error-reporting disable
71-
- cd src
72-
- npm i --ignore-scripts
73-
- npm run tsc
74-
- npm run package
75-
- cd ../demo
76-
- npm i
57+
- echo no | npm install -g nativescript
58+
- tns usage-reporting disable
59+
- tns error-reporting disable
60+
- cd src
61+
- npm i --ignore-scripts
62+
- npm run tsc
63+
- npm run package
64+
- cd ../demo
65+
- npm i

‎publish/scripts/installer.js‎

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -727,74 +727,74 @@ if (googlePlayServicesVersion != '+' && VersionNumber.parse(googlePlayServicesVe
727727
}
728728
729729
dependencies {
730-
compile "com.android.support:appcompat-v7:$supportVersion"
731-
compile "com.android.support:cardview-v7:$supportVersion"
732-
compile "com.android.support:customtabs:$supportVersion"
733-
compile "com.android.support:design:$supportVersion"
734-
compile "com.android.support:support-compat:$supportVersion"
730+
implementation "com.android.support:appcompat-v7:$supportVersion"
731+
implementation "com.android.support:cardview-v7:$supportVersion"
732+
implementation "com.android.support:customtabs:$supportVersion"
733+
implementation "com.android.support:design:$supportVersion"
734+
implementation "com.android.support:support-compat:$supportVersion"
735735
736736
// make sure you have these versions by updating your local Android SDK's (Android Support repo and Google repo)
737-
compile "com.google.firebase:firebase-core:16.0.6"
737+
implementation "com.google.firebase:firebase-core:16.0.6"
738738
739-
// compile "com.google.firebase:firebase-analytics:16.0.6"
739+
// implementation "com.google.firebase:firebase-analytics:16.0.6"
740740
741741
// for reading google-services.json and configuration
742-
compile "com.google.android.gms:play-services-base:$googlePlayServicesVersion"
742+
implementation "com.google.android.gms:play-services-base:$googlePlayServicesVersion"
743743
744744
// Authentication
745-
` + (!externalPushClientOnly && (!isPresent(result.authentication) || isSelected(result.authentication)) ? `` : `//`) + ` compile "com.google.firebase:firebase-auth:16.1.0"
745+
` + (!externalPushClientOnly && (!isPresent(result.authentication) || isSelected(result.authentication)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-auth:16.1.0"
746746
747747
// Realtime DB
748-
` + (!externalPushClientOnly && (!isPresent(result.realtimedb) || isSelected(result.realtimedb)) ? `` : `//`) + ` compile "com.google.firebase:firebase-database:16.0.6"
748+
` + (!externalPushClientOnly && (!isPresent(result.realtimedb) || isSelected(result.realtimedb)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-database:16.0.6"
749749
750750
// Cloud Firestore
751-
` + (isSelected(result.firestore) ? `` : `//`) + ` compile "com.google.firebase:firebase-firestore:18.0.0"
751+
` + (isSelected(result.firestore) ? `` : `//`) + ` implementation "com.google.firebase:firebase-firestore:18.0.0"
752752
753753
// Remote Config
754-
` + (isSelected(result.remote_config) ? `` : `//`) + ` compile "com.google.firebase:firebase-config:16.1.3"
754+
` + (isSelected(result.remote_config) ? `` : `//`) + ` implementation "com.google.firebase:firebase-config:16.1.3"
755755
756756
// Performance Monitoring
757-
` + (isSelected(result.performance_monitoring) ? `` : `//`) + ` compile "com.google.firebase:firebase-perf:16.2.3"
757+
` + (isSelected(result.performance_monitoring) ? `` : `//`) + ` implementation "com.google.firebase:firebase-perf:16.2.3"
758758
759759
// Crash Reporting
760-
` + (isSelected(result.crash_reporting) && !isSelected(result.crashlytics) ? `` : `//`) + ` compile "com.google.firebase:firebase-crash:16.2.1"
760+
` + (isSelected(result.crash_reporting) && !isSelected(result.crashlytics) ? `` : `//`) + ` implementation "com.google.firebase:firebase-crash:16.2.1"
761761
762762
// Crashlytics
763-
` + (isSelected(result.crashlytics) ? `` : `//`) + ` compile "com.crashlytics.sdk.android:crashlytics:2.9.8"
763+
` + (isSelected(result.crashlytics) ? `` : `//`) + ` implementation "com.crashlytics.sdk.android:crashlytics:2.9.8"
764764
765765
// Cloud Messaging (FCM)
766-
` + (isSelected(result.messaging) || externalPushClientOnly ? `` : `//`) + ` compile "com.google.firebase:firebase-messaging:17.3.4"
766+
` + (isSelected(result.messaging) || externalPushClientOnly ? `` : `//`) + ` implementation "com.google.firebase:firebase-messaging:17.3.4"
767767
768768
// In-App Messaging
769-
` + (isSelected(result.in_app_messaging) ? `` : `//`) + ` compile "com.google.firebase:firebase-inappmessaging-display:17.0.5"
769+
` + (isSelected(result.in_app_messaging) ? `` : `//`) + ` implementation "com.google.firebase:firebase-inappmessaging-display:17.0.5"
770770
771771
// Cloud Storage
772-
` + (isSelected(result.storage) ? `` : `//`) + ` compile "com.google.firebase:firebase-storage:16.0.5"
772+
` + (isSelected(result.storage) ? `` : `//`) + ` implementation "com.google.firebase:firebase-storage:16.0.5"
773773
774774
// Cloud Functions
775-
` + (isSelected(result.functions) ? `` : `//`) + ` compile "com.google.firebase:firebase-functions:16.1.3"
775+
` + (isSelected(result.functions) ? `` : `//`) + ` implementation "com.google.firebase:firebase-functions:16.1.3"
776776
777777
// AdMob / Ads
778-
` + (isSelected(result.admob) ? `` : `//`) + ` compile "com.google.firebase:firebase-ads:17.1.2"
778+
` + (isSelected(result.admob) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ads:17.1.2"
779779
780780
// ML Kit
781-
` + (isSelected(result.ml_kit) ? `` : `//`) + ` compile "com.google.firebase:firebase-ml-vision:18.0.2"
782-
` + (isSelected(result.ml_kit_image_labeling) ? `` : `//`) + ` compile "com.google.firebase:firebase-ml-vision-image-label-model:17.0.2"
783-
` + (isSelected(result.ml_kit_custom_model) ? `` : `//`) + ` compile "com.google.firebase:firebase-ml-model-interpreter:16.2.4"
784-
` + (isSelected(result.ml_kit_natural_language_identification) ? `//` : `//`) + ` compile "com.google.firebase:firebase-ml-natural-language:18.1.1"
785-
` + (isSelected(result.ml_kit_natural_language_identification) ? `//` : `//`) + ` compile "com.google.firebase:firebase-ml-natural-language-language-id-model:18.0.2"
781+
` + (isSelected(result.ml_kit) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-vision:18.0.2"
782+
` + (isSelected(result.ml_kit_image_labeling) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-vision-image-label-model:17.0.2"
783+
` + (isSelected(result.ml_kit_custom_model) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-model-interpreter:16.2.4"
784+
` + (isSelected(result.ml_kit_natural_language_identification) ? `//` : `//`) + ` implementation "com.google.firebase:firebase-ml-natural-language:18.1.1"
785+
` + (isSelected(result.ml_kit_natural_language_identification) ? `//` : `//`) + ` implementation "com.google.firebase:firebase-ml-natural-language-language-id-model:18.0.2"
786786
787787
// Facebook Authentication
788-
` + (isSelected(result.facebook_auth) ? `` : `//`) + ` compile ("com.facebook.android:facebook-android-sdk:4.35.0"){ exclude group: 'com.google.zxing' }
788+
` + (isSelected(result.facebook_auth) ? `` : `//`) + ` implementation ("com.facebook.android:facebook-android-sdk:4.35.0"){ exclude group: 'com.google.zxing' }
789789
790790
// Google Sign-In Authentication
791-
` + (isSelected(result.google_auth) ? `` : `//`) + ` compile "com.google.android.gms:play-services-auth:16.0.0"
791+
` + (isSelected(result.google_auth) ? `` : `//`) + ` implementation "com.google.android.gms:play-services-auth:16.0.0"
792792
793793
// Invites
794-
` + (isSelected(result.invites) ? `` : `//`) + ` compile "com.google.firebase:firebase-invites:16.0.6"
794+
` + (isSelected(result.invites) ? `` : `//`) + ` implementation "com.google.firebase:firebase-invites:16.0.6"
795795
796796
// Dynamic Links
797-
` + (isSelected(result.dynamic_links) ? `` : `//`) + ` compile "com.google.firebase:firebase-dynamic-links:16.1.5"
797+
` + (isSelected(result.dynamic_links) ? `` : `//`) + ` implementation "com.google.firebase:firebase-dynamic-links:16.1.5"
798798
}
799799
800800
apply plugin: "com.google.gms.google-services"
@@ -1080,8 +1080,6 @@ module.exports = function($logger, $projectData) {
10801080
});
10811081
}
10821082
1083-
buildGradleContent = buildGradleContent.replace("com.android.tools.build:gradle:3.2.0", "com.android.tools.build:gradle:3.2.1");
1084-
10851083
fs.writeFileSync(projectBuildGradlePath, buildGradleContent);
10861084
}
10871085

‎src/scripts/postinstall.js‎

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4899,74 +4899,74 @@ if (googlePlayServicesVersion != '+' && VersionNumber.parse(googlePlayServicesVe
48994899
}
49004900
49014901
dependencies {
4902-
compile "com.android.support:appcompat-v7:$supportVersion"
4903-
compile "com.android.support:cardview-v7:$supportVersion"
4904-
compile "com.android.support:customtabs:$supportVersion"
4905-
compile "com.android.support:design:$supportVersion"
4906-
compile "com.android.support:support-compat:$supportVersion"
4902+
implementation "com.android.support:appcompat-v7:$supportVersion"
4903+
implementation "com.android.support:cardview-v7:$supportVersion"
4904+
implementation "com.android.support:customtabs:$supportVersion"
4905+
implementation "com.android.support:design:$supportVersion"
4906+
implementation "com.android.support:support-compat:$supportVersion"
49074907
49084908
// make sure you have these versions by updating your local Android SDK's (Android Support repo and Google repo)
4909-
compile "com.google.firebase:firebase-core:16.0.6"
4909+
implementation "com.google.firebase:firebase-core:16.0.6"
49104910
4911-
// compile "com.google.firebase:firebase-analytics:16.0.6"
4911+
// implementation "com.google.firebase:firebase-analytics:16.0.6"
49124912
49134913
// for reading google-services.json and configuration
4914-
compile "com.google.android.gms:play-services-base:$googlePlayServicesVersion"
4914+
implementation "com.google.android.gms:play-services-base:$googlePlayServicesVersion"
49154915
49164916
// Authentication
4917-
` + (!externalPushClientOnly && (!isPresent(result.authentication) || isSelected(result.authentication)) ? `` : `//`) + ` compile "com.google.firebase:firebase-auth:16.1.0"
4917+
` + (!externalPushClientOnly && (!isPresent(result.authentication) || isSelected(result.authentication)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-auth:16.1.0"
49184918
49194919
// Realtime DB
4920-
` + (!externalPushClientOnly && (!isPresent(result.realtimedb) || isSelected(result.realtimedb)) ? `` : `//`) + ` compile "com.google.firebase:firebase-database:16.0.6"
4920+
` + (!externalPushClientOnly && (!isPresent(result.realtimedb) || isSelected(result.realtimedb)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-database:16.0.6"
49214921
49224922
// Cloud Firestore
4923-
` + (isSelected(result.firestore) ? `` : `//`) + ` compile "com.google.firebase:firebase-firestore:18.0.0"
4923+
` + (isSelected(result.firestore) ? `` : `//`) + ` implementation "com.google.firebase:firebase-firestore:18.0.0"
49244924
49254925
// Remote Config
4926-
` + (isSelected(result.remote_config) ? `` : `//`) + ` compile "com.google.firebase:firebase-config:16.1.3"
4926+
` + (isSelected(result.remote_config) ? `` : `//`) + ` implementation "com.google.firebase:firebase-config:16.1.3"
49274927
49284928
// Performance Monitoring
4929-
` + (isSelected(result.performance_monitoring) ? `` : `//`) + ` compile "com.google.firebase:firebase-perf:16.2.3"
4929+
` + (isSelected(result.performance_monitoring) ? `` : `//`) + ` implementation "com.google.firebase:firebase-perf:16.2.3"
49304930
49314931
// Crash Reporting
4932-
` + (isSelected(result.crash_reporting) && !isSelected(result.crashlytics) ? `` : `//`) + ` compile "com.google.firebase:firebase-crash:16.2.1"
4932+
` + (isSelected(result.crash_reporting) && !isSelected(result.crashlytics) ? `` : `//`) + ` implementation "com.google.firebase:firebase-crash:16.2.1"
49334933
49344934
// Crashlytics
4935-
` + (isSelected(result.crashlytics) ? `` : `//`) + ` compile "com.crashlytics.sdk.android:crashlytics:2.9.8"
4935+
` + (isSelected(result.crashlytics) ? `` : `//`) + ` implementation "com.crashlytics.sdk.android:crashlytics:2.9.8"
49364936
49374937
// Cloud Messaging (FCM)
4938-
` + (isSelected(result.messaging) || externalPushClientOnly ? `` : `//`) + ` compile "com.google.firebase:firebase-messaging:17.3.4"
4938+
` + (isSelected(result.messaging) || externalPushClientOnly ? `` : `//`) + ` implementation "com.google.firebase:firebase-messaging:17.3.4"
49394939
49404940
// In-App Messaging
4941-
` + (isSelected(result.in_app_messaging) ? `` : `//`) + ` compile "com.google.firebase:firebase-inappmessaging-display:17.0.5"
4941+
` + (isSelected(result.in_app_messaging) ? `` : `//`) + ` implementation "com.google.firebase:firebase-inappmessaging-display:17.0.5"
49424942
49434943
// Cloud Storage
4944-
` + (isSelected(result.storage) ? `` : `//`) + ` compile "com.google.firebase:firebase-storage:16.0.5"
4944+
` + (isSelected(result.storage) ? `` : `//`) + ` implementation "com.google.firebase:firebase-storage:16.0.5"
49454945
49464946
// Cloud Functions
4947-
` + (isSelected(result.functions) ? `` : `//`) + ` compile "com.google.firebase:firebase-functions:16.1.3"
4947+
` + (isSelected(result.functions) ? `` : `//`) + ` implementation "com.google.firebase:firebase-functions:16.1.3"
49484948
49494949
// AdMob / Ads
4950-
` + (isSelected(result.admob) ? `` : `//`) + ` compile "com.google.firebase:firebase-ads:17.1.2"
4950+
` + (isSelected(result.admob) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ads:17.1.2"
49514951
49524952
// ML Kit
4953-
` + (isSelected(result.ml_kit) ? `` : `//`) + ` compile "com.google.firebase:firebase-ml-vision:18.0.2"
4954-
` + (isSelected(result.ml_kit_image_labeling) ? `` : `//`) + ` compile "com.google.firebase:firebase-ml-vision-image-label-model:17.0.2"
4955-
` + (isSelected(result.ml_kit_custom_model) ? `` : `//`) + ` compile "com.google.firebase:firebase-ml-model-interpreter:16.2.4"
4956-
` + (isSelected(result.ml_kit_natural_language_identification) ? `//` : `//`) + ` compile "com.google.firebase:firebase-ml-natural-language:18.1.1"
4957-
` + (isSelected(result.ml_kit_natural_language_identification) ? `//` : `//`) + ` compile "com.google.firebase:firebase-ml-natural-language-language-id-model:18.0.2"
4953+
` + (isSelected(result.ml_kit) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-vision:18.0.2"
4954+
` + (isSelected(result.ml_kit_image_labeling) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-vision-image-label-model:17.0.2"
4955+
` + (isSelected(result.ml_kit_custom_model) ? `` : `//`) + ` implementation "com.google.firebase:firebase-ml-model-interpreter:16.2.4"
4956+
` + (isSelected(result.ml_kit_natural_language_identification) ? `//` : `//`) + ` implementation "com.google.firebase:firebase-ml-natural-language:18.1.1"
4957+
` + (isSelected(result.ml_kit_natural_language_identification) ? `//` : `//`) + ` implementation "com.google.firebase:firebase-ml-natural-language-language-id-model:18.0.2"
49584958
49594959
// Facebook Authentication
4960-
` + (isSelected(result.facebook_auth) ? `` : `//`) + ` compile ("com.facebook.android:facebook-android-sdk:4.35.0"){ exclude group: 'com.google.zxing' }
4960+
` + (isSelected(result.facebook_auth) ? `` : `//`) + ` implementation ("com.facebook.android:facebook-android-sdk:4.35.0"){ exclude group: 'com.google.zxing' }
49614961
49624962
// Google Sign-In Authentication
4963-
` + (isSelected(result.google_auth) ? `` : `//`) + ` compile "com.google.android.gms:play-services-auth:16.0.0"
4963+
` + (isSelected(result.google_auth) ? `` : `//`) + ` implementation "com.google.android.gms:play-services-auth:16.0.0"
49644964
49654965
// Invites
4966-
` + (isSelected(result.invites) ? `` : `//`) + ` compile "com.google.firebase:firebase-invites:16.0.6"
4966+
` + (isSelected(result.invites) ? `` : `//`) + ` implementation "com.google.firebase:firebase-invites:16.0.6"
49674967
49684968
// Dynamic Links
4969-
` + (isSelected(result.dynamic_links) ? `` : `//`) + ` compile "com.google.firebase:firebase-dynamic-links:16.1.5"
4969+
` + (isSelected(result.dynamic_links) ? `` : `//`) + ` implementation "com.google.firebase:firebase-dynamic-links:16.1.5"
49704970
}
49714971
49724972
apply plugin: "com.google.gms.google-services"
@@ -5252,8 +5252,6 @@ module.exports = function($logger, $projectData) {
52525252
});
52535253
}
52545254
5255-
buildGradleContent = buildGradleContent.replace("com.android.tools.build:gradle:3.2.0", "com.android.tools.build:gradle:3.2.1");
5256-
52575255
fs.writeFileSync(projectBuildGradlePath, buildGradleContent);
52585256
}
52595257

0 commit comments

Comments
 (0)