open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
81e93122 1 parent ee6ee87a

new gradle, fixes for new gradle

Expand all
Inline Side-by-side
Showing 18 changed files with 14 additions and 93 deletions
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 </deviceKey> 15 </deviceKey>
16 </Target> 16 </Target>
17 </runningDeviceTargetSelectedWithDropDown> 17 </runningDeviceTargetSelectedWithDropDown>
18 - <timeTargetWasSelectedWithDropDown value="2024-07-26T13:26:33.140020Z" /> 18 + <timeTargetWasSelectedWithDropDown value="2024-07-26T14:53:01.900442Z" />
19 </State> 19 </State>
20 </entry> 20 </entry>
21 </value> 21 </value>
......
...@@ -3,6 +3,7 @@ apply plugin: 'com.android.application' ...@@ -3,6 +3,7 @@ apply plugin: 'com.android.application'
3 //apply plugin: 'com.huawei.agconnect' 3 //apply plugin: 'com.huawei.agconnect'
4 4
5 android { 5 android {
6 + namespace "warp.ly.android_sdk"
6 compileSdkVersion 34 7 compileSdkVersion 34
7 buildToolsVersion "34.0.0" 8 buildToolsVersion "34.0.0"
8 9
......
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<manifest xmlns:android="http://schemas.android.com/apk/res/android" 2 +<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3 - package="warp.ly.android_sdk">
4 3
5 <uses-permission android:name="android.permission.INTERNET" /> 4 <uses-permission android:name="android.permission.INTERNET" />
6 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 5 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
......
...@@ -8,7 +8,7 @@ buildscript { ...@@ -8,7 +8,7 @@ buildscript {
8 maven { url 'https://plugins.gradle.org/m2/' } 8 maven { url 'https://plugins.gradle.org/m2/' }
9 } 9 }
10 dependencies { 10 dependencies {
11 - classpath 'com.android.tools.build:gradle:7.1.3' 11 + classpath 'com.android.tools.build:gradle:8.1.4'
12 classpath 'com.google.gms:google-services:4.3.10' 12 classpath 'com.google.gms:google-services:4.3.10'
13 classpath 'com.huawei.agconnect:agcp:1.7.2.300' 13 classpath 'com.huawei.agconnect:agcp:1.7.2.300'
14 classpath 'io.github.gradle-nexus:publish-plugin:1.1.0' 14 classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
......
1 +#Fri Jul 26 17:08:44 EEST 2024
1 distributionBase=GRADLE_USER_HOME 2 distributionBase=GRADLE_USER_HOME
2 distributionPath=wrapper/dists 3 distributionPath=wrapper/dists
3 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip 4 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
4 zipStoreBase=GRADLE_USER_HOME 5 zipStoreBase=GRADLE_USER_HOME
5 zipStorePath=wrapper/dists 6 zipStorePath=wrapper/dists
......
...@@ -32,7 +32,7 @@ afterEvaluate { ...@@ -32,7 +32,7 @@ afterEvaluate {
32 32
33 // Two artifacts, the `aar` (or `jar`) and the sources 33 // Two artifacts, the `aar` (or `jar`) and the sources
34 if (project.plugins.findPlugin("com.android.library")) { 34 if (project.plugins.findPlugin("com.android.library")) {
35 - from components.release 35 + from components.findByName('release')
36 } else { 36 } else {
37 from components.java 37 from components.java
38 } 38 }
......
...@@ -9,7 +9,7 @@ ext { ...@@ -9,7 +9,7 @@ ext {
9 apply from: "${rootProject.projectDir}/scripts/publish-module.gradle" 9 apply from: "${rootProject.projectDir}/scripts/publish-module.gradle"
10 10
11 android { 11 android {
12 - 12 + namespace 'ly.warp.sdk'
13 compileSdkVersion 34 13 compileSdkVersion 34
14 buildToolsVersion "34.0.0" 14 buildToolsVersion "34.0.0"
15 15
...@@ -107,9 +107,6 @@ dependencies { ...@@ -107,9 +107,6 @@ dependencies {
107 implementation 'com.squareup.retrofit2:retrofit:2.9.0' 107 implementation 'com.squareup.retrofit2:retrofit:2.9.0'
108 implementation 'com.squareup.retrofit2:converter-gson:2.9.0' 108 implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
109 109
110 - //------------------------------ Expandable Layout -----------------------------//
111 - api 'net.cachapa.expandablelayout:expandablelayout:2.9.2'
112 -
113 //------------------------------ Lifecycle -----------------------------// 110 //------------------------------ Lifecycle -----------------------------//
114 implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" 111 implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
115 112
......
1 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 1 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
2 - xmlns:tools="http://schemas.android.com/tools" 2 + xmlns:tools="http://schemas.android.com/tools">
3 - package="ly.warp.sdk">
4 3
5 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> 4 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
6 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> 5 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
...@@ -177,57 +176,6 @@ ...@@ -177,57 +176,6 @@
177 </intent-filter> 176 </intent-filter>
178 </activity> 177 </activity>
179 178
180 - <!-- Service used for updating user's location. -->
181 - <service
182 - android:name=".services.UpdateUserLocationService"
183 - android:exported="false"
184 - android:permission="android.permission.BIND_JOB_SERVICE" />
185 -
186 - <service
187 - android:name=".services.EventService"
188 - android:exported="false"
189 - android:permission="android.permission.BIND_JOB_SERVICE" />
190 -
191 - <service
192 - android:name=".services.VouchersFetchedService"
193 - android:exported="false"
194 - android:permission="android.permission.BIND_JOB_SERVICE" />
195 -
196 - <service
197 - android:name=".services.EventCouponsService"
198 - android:exported="false"
199 - android:permission="android.permission.BIND_JOB_SERVICE" />
200 -
201 - <service
202 - android:name=".services.EventRewardsCouponsService"
203 - android:exported="false"
204 - android:permission="android.permission.BIND_JOB_SERVICE" />
205 -
206 - <service
207 - android:name=".services.EventUnifiedCouponsService"
208 - android:exported="false"
209 - android:permission="android.permission.BIND_JOB_SERVICE" />
210 -
211 - <service
212 - android:name=".services.EventCampaignCouponService"
213 - android:exported="false"
214 - android:permission="android.permission.BIND_JOB_SERVICE" />
215 -
216 - <service
217 - android:name=".services.EventCampaignService"
218 - android:exported="false"
219 - android:permission="android.permission.BIND_JOB_SERVICE" />
220 -
221 - <service
222 - android:name=".services.EventRefreshDeviceTokenService"
223 - android:exported="false"
224 - android:permission="android.permission.BIND_JOB_SERVICE" />
225 -
226 - <service
227 - android:name=".services.EventQuestionnaireService"
228 - android:exported="false"
229 - android:permission="android.permission.BIND_JOB_SERVICE" />
230 -
231 <!-- android:stopWithTask="false"--> 179 <!-- android:stopWithTask="false"-->
232 <!-- android:process=":warplyHealthService"--> 180 <!-- android:process=":warplyHealthService"-->
233 <!-- <service--> 181 <!-- <service-->
......
...@@ -52,7 +52,6 @@ import java.util.List; ...@@ -52,7 +52,6 @@ import java.util.List;
52 import java.util.Map; 52 import java.util.Map;
53 import java.util.concurrent.TimeUnit; 53 import java.util.concurrent.TimeUnit;
54 54
55 -import ly.warp.sdk.BuildConfig;
56 import ly.warp.sdk.Warply; 55 import ly.warp.sdk.Warply;
57 import ly.warp.sdk.dexter.listener.DexterError; 56 import ly.warp.sdk.dexter.listener.DexterError;
58 import ly.warp.sdk.dexter.listener.PermissionDeniedResponse; 57 import ly.warp.sdk.dexter.listener.PermissionDeniedResponse;
...@@ -102,11 +101,9 @@ public class UpdateUserLocationService extends Worker { ...@@ -102,11 +101,9 @@ public class UpdateUserLocationService extends Worker {
102 PermissionsUtil.PERMISSION_LOCATION_FINE 101 PermissionsUtil.PERMISSION_LOCATION_FINE
103 ).requestPermissions(); 102 ).requestPermissions();
104 } catch (SecurityException e) { 103 } catch (SecurityException e) {
105 - if (BuildConfig.DEBUG) {
106 e.printStackTrace(); 104 e.printStackTrace();
107 WorkManager.getInstance(Warply.getWarplyContext()).cancelAllWorkByTag(TAG); 105 WorkManager.getInstance(Warply.getWarplyContext()).cancelAllWorkByTag(TAG);
108 } 106 }
109 - }
110 } else { 107 } else {
111 WorkManager.getInstance(Warply.getWarplyContext()).cancelAllWorkByTag(TAG); 108 WorkManager.getInstance(Warply.getWarplyContext()).cancelAllWorkByTag(TAG);
112 } 109 }
...@@ -187,7 +184,6 @@ public class UpdateUserLocationService extends Worker { ...@@ -187,7 +184,6 @@ public class UpdateUserLocationService extends Worker {
187 getGeofences().add(new WarpGeoFence(geoArray.getJSONObject(i))); 184 getGeofences().add(new WarpGeoFence(geoArray.getJSONObject(i)));
188 } 185 }
189 } catch (JSONException e) { 186 } catch (JSONException e) {
190 - if (BuildConfig.DEBUG)
191 e.printStackTrace(); 187 e.printStackTrace();
192 geofences = null; 188 geofences = null;
193 WarpUtils.log("failed during parsing geofencing data."); 189 WarpUtils.log("failed during parsing geofencing data.");
...@@ -427,10 +423,8 @@ public class UpdateUserLocationService extends Worker { ...@@ -427,10 +423,8 @@ public class UpdateUserLocationService extends Worker {
427 WarpUtils.log("Could not get location data."); 423 WarpUtils.log("Could not get location data.");
428 }); 424 });
429 } catch (SecurityException e) { 425 } catch (SecurityException e) {
430 - if (BuildConfig.DEBUG) {
431 e.printStackTrace(); 426 e.printStackTrace();
432 } 427 }
433 } 428 }
434 - }
435 }; 429 };
436 } 430 }
......
...@@ -38,7 +38,6 @@ import androidx.work.WorkManager; ...@@ -38,7 +38,6 @@ import androidx.work.WorkManager;
38 38
39 import java.util.List; 39 import java.util.List;
40 40
41 -import ly.warp.sdk.BuildConfig;
42 import ly.warp.sdk.Warply; 41 import ly.warp.sdk.Warply;
43 import ly.warp.sdk.dexter.listener.DexterError; 42 import ly.warp.sdk.dexter.listener.DexterError;
44 import ly.warp.sdk.dexter.listener.PermissionDeniedResponse; 43 import ly.warp.sdk.dexter.listener.PermissionDeniedResponse;
...@@ -122,11 +121,9 @@ public class WarplyLocationManager { ...@@ -122,11 +121,9 @@ public class WarplyLocationManager {
122 defaultMinTime, defaultMinDistance, 121 defaultMinTime, defaultMinDistance,
123 locationListenerPendingIntent); 122 locationListenerPendingIntent);
124 } catch (SecurityException e) { 123 } catch (SecurityException e) {
125 - if (BuildConfig.DEBUG) {
126 e.printStackTrace(); 124 e.printStackTrace();
127 } 125 }
128 } 126 }
129 - }
130 }; 127 };
131 128
132 try { 129 try {
...@@ -137,7 +134,6 @@ public class WarplyLocationManager { ...@@ -137,7 +134,6 @@ public class WarplyLocationManager {
137 PermissionsUtil.PERMISSION_LOCATION_FINE 134 PermissionsUtil.PERMISSION_LOCATION_FINE
138 ).requestPermissions(); 135 ).requestPermissions();
139 } catch (Exception e) { 136 } catch (Exception e) {
140 - if (BuildConfig.DEBUG)
141 e.printStackTrace(); 137 e.printStackTrace();
142 } 138 }
143 } 139 }
...@@ -262,11 +258,9 @@ public class WarplyLocationManager { ...@@ -262,11 +258,9 @@ public class WarplyLocationManager {
262 lm.requestLocationUpdates(bestProvider, minTime, minDistance, locationListenerPendingIntent); 258 lm.requestLocationUpdates(bestProvider, minTime, minDistance, locationListenerPendingIntent);
263 } 259 }
264 } catch (SecurityException e) { 260 } catch (SecurityException e) {
265 - if (BuildConfig.DEBUG) {
266 e.printStackTrace(); 261 e.printStackTrace();
267 } 262 }
268 } 263 }
269 - }
270 }; 264 };
271 265
272 new PermissionsUtil( 266 new PermissionsUtil(
...@@ -276,12 +270,10 @@ public class WarplyLocationManager { ...@@ -276,12 +270,10 @@ public class WarplyLocationManager {
276 PermissionsUtil.PERMISSION_LOCATION_FINE 270 PermissionsUtil.PERMISSION_LOCATION_FINE
277 ).requestPermissions(); 271 ).requestPermissions();
278 } catch (SecurityException e) { 272 } catch (SecurityException e) {
279 - if (BuildConfig.DEBUG) {
280 e.printStackTrace(); 273 e.printStackTrace();
281 } 274 }
282 } 275 }
283 } 276 }
284 - }
285 277
286 // MicroAppIndexes geofencingIndex = MicroAppIndexes.GEOFENCING_INDEX; 278 // MicroAppIndexes geofencingIndex = MicroAppIndexes.GEOFENCING_INDEX;
287 // 279 //
......
...@@ -16,7 +16,6 @@ import android.widget.ImageView; ...@@ -16,7 +16,6 @@ import android.widget.ImageView;
16 import android.widget.RelativeLayout; 16 import android.widget.RelativeLayout;
17 17
18 18
19 -import ly.warp.sdk.BuildConfig;
20 import ly.warp.sdk.io.models.Campaign; 19 import ly.warp.sdk.io.models.Campaign;
21 import ly.warp.sdk.utils.WarpUtils; 20 import ly.warp.sdk.utils.WarpUtils;
22 import ly.warp.sdk.utils.WarplyDeviceInfoCollector; 21 import ly.warp.sdk.utils.WarplyDeviceInfoCollector;
...@@ -117,11 +116,9 @@ public class CampaignItemWebHolder extends CampaignItemViewHolder { ...@@ -117,11 +116,9 @@ public class CampaignItemWebHolder extends CampaignItemViewHolder {
117 try { 116 try {
118 context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); 117 context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
119 } catch (ActivityNotFoundException e) { 118 } catch (ActivityNotFoundException e) {
120 - if (BuildConfig.DEBUG) {
121 e.printStackTrace(); 119 e.printStackTrace();
122 } 120 }
123 } 121 }
124 - }
125 }); 122 });
126 warpView.setOnTouchListener(new View.OnTouchListener() { 123 warpView.setOnTouchListener(new View.OnTouchListener() {
127 @Override 124 @Override
......
1 package ly.warp.sdk.views; 1 package ly.warp.sdk.views;
2 2
3 import android.content.Context; 3 import android.content.Context;
4 +
4 import androidx.fragment.app.Fragment; 5 import androidx.fragment.app.Fragment;
5 import androidx.fragment.app.FragmentActivity; 6 import androidx.fragment.app.FragmentActivity;
6 import androidx.fragment.app.FragmentManager; 7 import androidx.fragment.app.FragmentManager;
7 import androidx.fragment.app.FragmentTransaction; 8 import androidx.fragment.app.FragmentTransaction;
9 +
8 import android.text.TextUtils; 10 import android.text.TextUtils;
9 11
10 -import ly.warp.sdk.BuildConfig;
11 import ly.warp.sdk.Warply; 12 import ly.warp.sdk.Warply;
12 import ly.warp.sdk.fragments.WarpViewFragment; 13 import ly.warp.sdk.fragments.WarpViewFragment;
13 import ly.warp.sdk.io.callbacks.CallbackReceiver; 14 import ly.warp.sdk.io.callbacks.CallbackReceiver;
...@@ -87,12 +88,10 @@ public class CampaignViewLoader implements CallbackReceiver<CampaignList> { ...@@ -87,12 +88,10 @@ public class CampaignViewLoader implements CallbackReceiver<CampaignList> {
87 try { 88 try {
88 transaction.commit(); 89 transaction.commit();
89 } catch (IllegalStateException e) { 90 } catch (IllegalStateException e) {
90 - if (BuildConfig.DEBUG) {
91 e.printStackTrace(); 91 e.printStackTrace();
92 } 92 }
93 } 93 }
94 } 94 }
95 - }
96 95
97 private void notifySuccessExternalListener(CampaignList campaigns) { 96 private void notifySuccessExternalListener(CampaignList campaigns) {
98 97
......
...@@ -35,7 +35,6 @@ import android.content.Context; ...@@ -35,7 +35,6 @@ import android.content.Context;
35 import android.content.DialogInterface; 35 import android.content.DialogInterface;
36 import android.content.Intent; 36 import android.content.Intent;
37 import android.content.IntentSender; 37 import android.content.IntentSender;
38 -import android.content.pm.ApplicationInfo;
39 import android.content.pm.PackageManager; 38 import android.content.pm.PackageManager;
40 import android.location.LocationManager; 39 import android.location.LocationManager;
41 import android.net.Uri; 40 import android.net.Uri;
...@@ -103,12 +102,9 @@ import ly.warp.sdk.io.models.RefreshVouchersEventModel; ...@@ -103,12 +102,9 @@ import ly.warp.sdk.io.models.RefreshVouchersEventModel;
103 import ly.warp.sdk.io.models.UnifiedCoupon; 102 import ly.warp.sdk.io.models.UnifiedCoupon;
104 import ly.warp.sdk.io.models.WarplyCCMSEnabledModel; 103 import ly.warp.sdk.io.models.WarplyCCMSEnabledModel;
105 import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel; 104 import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel;
106 -import ly.warp.sdk.io.models.WarplyHealthEventModel;
107 import ly.warp.sdk.io.models.WarplyPacingCardEventModel; 105 import ly.warp.sdk.io.models.WarplyPacingCardEventModel;
108 -import ly.warp.sdk.io.models.WarplyPacingEventModel;
109 import ly.warp.sdk.io.models.WarplyUnifiedActivatedEventModel; 106 import ly.warp.sdk.io.models.WarplyUnifiedActivatedEventModel;
110 import ly.warp.sdk.services.EventCampaignService; 107 import ly.warp.sdk.services.EventCampaignService;
111 -import ly.warp.sdk.services.WarplyHealthService;
112 import ly.warp.sdk.utils.WarpUtils; 108 import ly.warp.sdk.utils.WarpUtils;
113 import ly.warp.sdk.utils.WarplyManagerHelper; 109 import ly.warp.sdk.utils.WarplyManagerHelper;
114 import ly.warp.sdk.utils.WarplyProperty; 110 import ly.warp.sdk.utils.WarplyProperty;
......
...@@ -10,7 +10,6 @@ import java.util.Collections; ...@@ -10,7 +10,6 @@ import java.util.Collections;
10 import java.util.Comparator; 10 import java.util.Comparator;
11 import java.util.concurrent.atomic.AtomicBoolean; 11 import java.util.concurrent.atomic.AtomicBoolean;
12 12
13 -import ly.warp.sdk.BuildConfig;
14 import ly.warp.sdk.Warply; 13 import ly.warp.sdk.Warply;
15 import ly.warp.sdk.io.callbacks.CallbackReceiver; 14 import ly.warp.sdk.io.callbacks.CallbackReceiver;
16 import ly.warp.sdk.io.callbacks.SimpleCallbackReceiver; 15 import ly.warp.sdk.io.callbacks.SimpleCallbackReceiver;
...@@ -142,10 +141,8 @@ public class CampaignsArrayAdapter<VH extends CampaignItemViewHolder> extends Ba ...@@ -142,10 +141,8 @@ public class CampaignsArrayAdapter<VH extends CampaignItemViewHolder> extends Ba
142 itemView = viewHolder.itemView; 141 itemView = viewHolder.itemView;
143 itemView.setTag(viewHolder); 142 itemView.setTag(viewHolder);
144 } catch (Exception e) { 143 } catch (Exception e) {
145 - if (BuildConfig.DEBUG) {
146 e.printStackTrace(); 144 e.printStackTrace();
147 } 145 }
148 - }
149 } else { 146 } else {
150 viewHolder = (VH) itemView.getTag(); 147 viewHolder = (VH) itemView.getTag();
151 } 148 }
......
1 package ly.warp.sdk.views.adapters.mix; 1 package ly.warp.sdk.views.adapters.mix;
2 2
3 import android.database.DataSetObserver; 3 import android.database.DataSetObserver;
4 +
4 import androidx.annotation.NonNull; 5 import androidx.annotation.NonNull;
5 import androidx.recyclerview.widget.RecyclerView; 6 import androidx.recyclerview.widget.RecyclerView;
7 +
6 import android.view.View; 8 import android.view.View;
7 import android.view.ViewGroup; 9 import android.view.ViewGroup;
8 import android.widget.AbsListView; 10 import android.widget.AbsListView;
9 import android.widget.BaseAdapter; 11 import android.widget.BaseAdapter;
10 import android.widget.ListView; 12 import android.widget.ListView;
11 13
12 -import ly.warp.sdk.BuildConfig;
13 import ly.warp.sdk.io.callbacks.SimpleCallbackReceiver; 14 import ly.warp.sdk.io.callbacks.SimpleCallbackReceiver;
14 import ly.warp.sdk.io.models.Campaign; 15 import ly.warp.sdk.io.models.Campaign;
15 import ly.warp.sdk.io.models.CampaignList; 16 import ly.warp.sdk.io.models.CampaignList;
...@@ -185,10 +186,8 @@ public class CampaignsMixListAdapter<VH extends CampaignItemViewHolder> extends ...@@ -185,10 +186,8 @@ public class CampaignsMixListAdapter<VH extends CampaignItemViewHolder> extends
185 itemView = viewHolder.itemView; 186 itemView = viewHolder.itemView;
186 itemView.setTag(viewHolder); 187 itemView.setTag(viewHolder);
187 } catch (Exception e) { 188 } catch (Exception e) {
188 - if (BuildConfig.DEBUG) {
189 e.printStackTrace(); 189 e.printStackTrace();
190 } 190 }
191 - }
192 } else { 191 } else {
193 viewHolder = (VH) itemView.getTag(); 192 viewHolder = (VH) itemView.getTag();
194 } 193 }
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
5 <attr name="dashLength" format="dimension" /> 5 <attr name="dashLength" format="dimension" />
6 <attr name="dashGap" format="dimension" /> 6 <attr name="dashGap" format="dimension" />
7 <attr name="dashThickness" format="dimension" /> 7 <attr name="dashThickness" format="dimension" />
8 + <attr name="colorPrimary" format="color" />
8 <attr name="orientation" format="enum"> 9 <attr name="orientation" format="enum">
9 <enum name="horizontal" value="0" /> 10 <enum name="horizontal" value="0" />
10 <enum name="vertical" value="1" /> 11 <enum name="vertical" value="1" />
......