fix: always use google repository, remedy apache compatibility

tidev · Feb 25, 2019 · 4067a88 · 4067a88
1 parent 024b8c9
commit 4067a88
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/android/manifest b/android/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 16.1.1
+version: 16.1.2
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86
 description: Titanium Google Play Services module.

diff --git a/android/timodule.xml b/android/timodule.xml
@@ -4,6 +4,7 @@
       <manifest>
          <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
          <application>
+            <uses-library android:name="org.apache.http.legacy" android:required="false" />
             <meta-data android:name="com.google.android.gms.version"
                        android:value="@integer/google_play_services_version"/>
          </application>

diff --git a/updater/index.js b/updater/index.js
@@ -98,6 +98,7 @@ async function getFiles (url, filter) {
     const libraries = await getList(repository);
     const blacklist = [
         'play-services-contextmanager',
+        'play-services-measurement',
         'play-services-instantapps',
         'play-services-vision',
         'play-services-vision-common',
@@ -133,7 +134,7 @@ async function getFiles (url, filter) {
         if (library.startsWith('play-') && !library.endsWith('license') && !blacklist.includes(library)) {
 
             // obtain latest version of library
-            const version = await getLatestVersion(repository + '/' + library);
+            const version = await getLatestVersion(repository + '/' + library + '?repo=google');
 
             // obtain library .aar
             const archives = await getFiles(repository + '/' + library + '/' + version, 'aar');