From 9d4d1df875da93d768e16d247dce83f6d77d61d3 Mon Sep 17 00:00:00 2001 From: Arnab Date: Thu, 6 Feb 2020 11:25:10 +0530 Subject: [PATCH 01/23] Traits getter support (#23) * traits getter support for braze * missing import * javadoc and flush changes * changes in RudderTraits reverted --- .../android/sdk/core/EventRepository.java | 13 + .../android/sdk/core/RudderClient.java | 7 + .../android/sdk/core/RudderIntegration.java | 2 + .../android/sdk/core/RudderTraits.java | 476 +++++++++++++++++- .../android/sdk/core/util/Utils.java | 1 + 5 files changed, 498 insertions(+), 1 deletion(-) diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/EventRepository.java b/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/EventRepository.java index 5a2a62a46..8098a77db 100644 --- a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/EventRepository.java +++ b/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/EventRepository.java @@ -465,6 +465,19 @@ void reset() { } } + void flush(){ + if (isFactoryInitialized) { + RudderLogger.logDebug("EventRepository: flush native SDKs"); + for (String key : integrationOperationsMap.keySet()) { + RudderLogger.logDebug(String.format(Locale.US, "EventRepository: flush for %s", key)); + RudderIntegration integration = integrationOperationsMap.get(key); + if (integration != null) { + integration.flush(); + } + } + } + } + void onIntegrationReady(String key, RudderClient.Callback callback) { RudderLogger.logDebug(String.format(Locale.US, "EventRepository: onIntegrationReady: callback registered for %s", key)); integrationCallbacks.put(key, callback); diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderClient.java b/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderClient.java index 40e674c47..eb72e3f61 100644 --- a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderClient.java +++ b/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderClient.java @@ -411,6 +411,13 @@ public void reset() { if (repository != null) repository.reset(); } + /** + * Flush Events + */ + public void flush() { + if (repository != null) repository.flush(); + } + /** * Register Native SDK callback for custom implementation * diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderIntegration.java b/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderIntegration.java index 894047929..10f872065 100644 --- a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderIntegration.java +++ b/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderIntegration.java @@ -11,6 +11,8 @@ public interface Factory { public abstract void dump(RudderMessage element); + public void flush() { + } /** * @return Instance of the initiated SDK */ diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderTraits.java b/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderTraits.java index 5cc3c2a1c..54675014b 100644 --- a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderTraits.java +++ b/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderTraits.java @@ -1,5 +1,6 @@ package com.rudderstack.android.sdk.core; +import com.google.gson.Gson; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import com.rudderstack.android.sdk.core.util.Utils; @@ -46,15 +47,253 @@ public class RudderTraits { @Expose(serialize = false) private transient Map extras; + private static final String ANONYMOUSID_KEY = "anonymousid"; + private static final String ADDRESS_KEY = "address"; + private static final String AGE_KEY = "age"; + private static final String BIRTHDAY_KEY = "birthday"; + private static final String COMPANY_KEY = "company"; + private static final String CREATEDAT_KEY = "createdat"; + private static final String DESCRIPTION_KEY = "description"; + private static final String EMAIL_KEY = "email"; + private static final String FIRSTNAME_KEY = "firstname"; + private static final String GENDER_KEY = "gender"; + private static final String USERID_KEY = "userid"; + private static final String LASTNAME_KEY = "lastname"; + private static final String NAME_KEY = "name"; + private static final String PHONE_KEY = "phone"; + private static final String TITLE_KEY = "title"; + private static final String USERNAME_KEY = "username"; + + /** + * Get Anonymous Id from traits + * + * @param traitsMap Map + * @return anonymousId String + */ + public static String getAnonymousId(Map traitsMap) { + if(traitsMap != null & traitsMap.containsKey(ANONYMOUSID_KEY)) + return (String)traitsMap.get(ANONYMOUSID_KEY); + return null; + } + + /** + * Get Address from traits + * + * @param traitsMap Map + * @return address String + */ + public static String getAddress(Map traitsMap) { + if(traitsMap != null & traitsMap.containsKey(ADDRESS_KEY)) + return (String)traitsMap.get(ADDRESS_KEY); + return null; + } + + /** + * Get Age from traits + * + * @param traitsMap Map + * @return age String + */ + public static String getAge(Map traitsMap) { + if(traitsMap != null & traitsMap.containsKey(AGE_KEY)) + return (String)traitsMap.get(AGE_KEY); + return null; + } + + /** + * Get Birthday from traits + * + * @param traitsMap Map + * @return birthday String + */ + public static String getBirthday(Map traitsMap) { + if(traitsMap != null & traitsMap.containsKey(BIRTHDAY_KEY)) + return (String)traitsMap.get(BIRTHDAY_KEY); + return null; + } + + /** + * Get Company from traits + * + * @param traitsMap Map + * @return company String + */ + public static String getCompany(Map traitsMap) { + if(traitsMap != null & traitsMap.containsKey(COMPANY_KEY)) + return (String)traitsMap.get(COMPANY_KEY); + return null; + } + + /** + * Get createdAt from traits + * + * @param traitsMap Map + * @return created_at String + */ + public static String getCreatedAt(Map traitsMap) { + if(traitsMap != null & traitsMap.containsKey(CREATEDAT_KEY)) + return (String)traitsMap.get(CREATEDAT_KEY); + return null; + } + + /** + * Get description from traits + * + * @param traitsMap Map + * @return description String + */ + public static String getDescription(Map traitsMap) { + if(traitsMap != null & traitsMap.containsKey(DESCRIPTION_KEY)) + return (String)traitsMap.get(DESCRIPTION_KEY); + return null; + } + + /** + * Get First Name from traits + * + * @param traitsMap Map + * @return firstName String + */ + public static String getFirstname(Map traitsMap) { + if(traitsMap != null & traitsMap.containsKey(FIRSTNAME_KEY)) + return (String)traitsMap.get(FIRSTNAME_KEY); + return null; + } + + /** + * Get email from traits + * + * @param traitsMap Map + * @return email String + */ + public static String getEmail(Map traitsMap) { + if(traitsMap != null & traitsMap.containsKey(EMAIL_KEY)) + return (String)traitsMap.get(EMAIL_KEY); + return null; + } + + /** + * Get gender from traits + * + * @param traitsMap Map + * @return gender String + */ + public static String getGender(Map traitsMap) { + if(traitsMap != null & traitsMap.containsKey(GENDER_KEY)) + return (String)traitsMap.get(GENDER_KEY); + return null; + } + + /** + * Get user id from traits + * + * @param traitsMap Map + * @return userId String + */ + public static String getUserid(Map traitsMap) { + if(traitsMap != null & traitsMap.containsKey(USERID_KEY)) + return (String)traitsMap.get(USERID_KEY); + return null; + } + + /** + * Get Last Name from traits + * + * @param traitsMap Map + * @return lastName String + */ + public static String getLastname(Map traitsMap) { + if(traitsMap != null & traitsMap.containsKey(LASTNAME_KEY)) + return (String)traitsMap.get(LASTNAME_KEY); + return null; + } + + /** + * Get name from traits + * + * @param traitsMap Map + * @return name String + */ + public static String getName(Map traitsMap) { + if(traitsMap != null & traitsMap.containsKey(NAME_KEY)) + return (String)traitsMap.get(NAME_KEY); + return null; + } + + /** + * Get phone from traits + * + * @param traitsMap Map + * @return phone String + */ + public static String getPhone(Map traitsMap) { + if(traitsMap != null & traitsMap.containsKey(PHONE_KEY)) + return (String)traitsMap.get(PHONE_KEY); + return null; + } + + /** + * Get title from traits + * + * @param traitsMap Map + * @return title String + */ + public static String getTitle(Map traitsMap) { + if(traitsMap != null & traitsMap.containsKey(TITLE_KEY)) + return (String)traitsMap.get(TITLE_KEY); + return null; + } + + /** + * Get user name from traits + * + * @param traitsMap Map + * @return userName String + */ + public static String getUsername(Map traitsMap) { + if(traitsMap != null & traitsMap.containsKey(USERNAME_KEY)) + return (String)traitsMap.get(USERNAME_KEY); + return null; + } + + + /** + * constructor + */ public RudderTraits() { RudderContext rudderContext = RudderElementCache.getCachedContext(); if (rudderContext != null) this.anonymousId = rudderContext.getDeviceId(); } + + /** + * constructor + * + * @param anonymousId String + */ RudderTraits(String anonymousId) { this.anonymousId = anonymousId; } + /** + * Initialise RudderTraits + * + * @param address Address + * @param age String + * @param birthday String + * @param company String + * @param createdAt String + * @param description String + * @param email String + * @param firstName String + * @param gender String + * @param id String + * @param lastName String + * @param name String + * @param phone String + * @param title + * @param userName String + */ public RudderTraits(Address address, String age, String birthday, Company company, String createdAt, String description, String email, String firstName, String gender, String id, String lastName, String name, String phone, String title, String userName) { this.address = address; this.age = age; @@ -74,95 +313,209 @@ public RudderTraits(Address address, String age, String birthday, Company compan this.userName = userName; } + /** + * Get Id + * + * @return id String + */ public String getId() { return id; } + /** + * Get Extras + * + * @return map Map + */ public Map getExtras() { return extras; } + + /** + * Put Address + * + * @param address Address + * @return traits RudderTraits + */ public RudderTraits putAddress(Address address) { this.address = address; return this; } + /** + * put Age + * + * @param age String + * @return traits RudderTraits + */ public RudderTraits putAge(String age) { this.age = age; return this; } + /** + * put Birthday + * + * @param birthday String + * @return traits RudderTraits + */ public RudderTraits putBirthday(String birthday) { this.birthday = birthday; return this; } + /** + * put Birthday as Date + * + * @param birthday Date + * @return traits RudderTraits + */ public RudderTraits putBirthday(Date birthday) { this.birthday = Utils.toDateString(birthday); return this; } + /** + * put Company + * + * @param company Company + * @return traits RudderTraits + */ public RudderTraits putCompany(Company company) { this.company = company; return this; } + /** + * put Created At + * + * @param createdAt String + * @return traits RudderTraits + */ public RudderTraits putCreatedAt(String createdAt) { this.createdAt = createdAt; return this; } + /** + * put description + * + * @param description String + * @return traits RudderTraits + */ public RudderTraits putDescription(String description) { this.description = description; return this; } + /** + * put email + * + * @param email String + * @return traits RudderTraits + */ public RudderTraits putEmail(String email) { this.email = email; return this; } + /** + * put First Name + * + * @param firstName String + * @return traits RudderTraits + */ public RudderTraits putFirstName(String firstName) { this.firstName = firstName; return this; } + /** + * put gender + * + * @param gender String + * @return traits RudderTraits + */ public RudderTraits putGender(String gender) { this.gender = gender; return this; } + /** + * put id + * + * @param id String + * @return traits RudderTraits + */ public RudderTraits putId(String id) { this.id = id; this.oldId = id; return this; } + /** + * put Last Name + * + * @param lastName String + * @return traits RudderTraits + */ public RudderTraits putLastName(String lastName) { this.lastName = lastName; return this; } + /** + * put name + * + * @param name String + * @return traits RudderTraits + */ public RudderTraits putName(String name) { this.name = name; return this; } + /** + * put phone + * + * @param phone String + * @return traits RudderTraits + */ public RudderTraits putPhone(String phone) { this.phone = phone; return this; } + /** + * put title + * + * @param title String + * @return traits RudderTraits + */ public RudderTraits putTitle(String title) { this.title = title; return this; } + /** + * put User Name + * + * @param userName String + * @return traits RudderTraits + */ public RudderTraits putUserName(String userName) { this.userName = userName; return this; } + /** + * put generic key value pairs + * + * @param key String + * @param value Object + * @return traits RudderTraits + */ public RudderTraits put(String key, Object value) { if (this.extras == null) { this.extras = new HashMap<>(); @@ -171,6 +524,7 @@ public RudderTraits put(String key, Object value) { return this; } + public static class Address { @SerializedName("city") private String city; @@ -183,34 +537,118 @@ public static class Address { @SerializedName("street") private String street; + /** + * get city + * + * @return city String + */ + public String getCity() { + return city; + } + + /** + * get country + * + * @return country String + */ + public String getCountry() { + return country; + } + + /** + * get postal code + * + * @return postalCode String + */ + public String getPostalCode() { + return postalCode; + } + + /** + * get state + * + * @return state String + */ + public String getState() { + return state; + } + + /** + * get street + * + * @return street String + */ + public String getStreet() { + return street; + } + public Address() { } + + /** + * put city + * + * @param city String + * @return address Address + */ public Address putCity(String city) { this.city = city; return this; } + /** + * put country + * + * @param country String + * @return address Address + */ public Address putCountry(String country) { this.country = country; return this; } + /** + * put postal code + * + * @param postalCode String + * @return address Address + */ public Address putPostalCode(String postalCode) { this.postalCode = postalCode; return this; } + /** + * put state String + * + * @param state String + * @return address Address + */ public Address putState(String state) { this.state = state; return this; } + /** + * put street String + * + * @param street String + * @return address Address + */ public Address putStreet(String street) { this.street = street; return this; } + /** + * constructor + * @param city String + * @param country String + * @param postalCode String + * @param state String + * @param street String + */ public Address(String city, String country, String postalCode, String state, String street) { this.city = city; this.country = country; @@ -218,6 +656,17 @@ public Address(String city, String country, String postalCode, String state, Str this.state = state; this.street = street; } + + /** + * make address from String + * + * @param address + * @return address Address + */ + public static Address fromString(String address){ + Address add = new Gson().fromJson(address,Address.class); + return add; + } } public static class Company { @@ -228,25 +677,50 @@ public static class Company { @SerializedName("industry") private String industry; + /** + * constructor + * + * @param name String + * @param id String + * @param industry String + */ Company(String name, String id, String industry) { this.name = name; this.id = id; this.industry = industry; } + /** + * put name + * + * @param name String + * @return company Company + */ public Company putName(String name) { this.name = name; return this; } + /** + * put company Id + * + * @param id String + * @return company Company + */ public Company putId(String id) { this.id = id; return this; } + /** + * put industry + * + * @param industry String + * @return company Company + */ public Company putIndustry(String industry) { this.industry = industry; return this; } } -} +} \ No newline at end of file diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/util/Utils.java b/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/util/Utils.java index 83b97a837..49a4875ee 100644 --- a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/util/Utils.java +++ b/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/util/Utils.java @@ -8,6 +8,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; From f4a3d55e9771b02bacac56cc9e5e273a128ef43d Mon Sep 17 00:00:00 2001 From: arnab Date: Thu, 6 Feb 2020 11:50:29 +0530 Subject: [PATCH 02/23] Fix in traits for anonymousId --- rudder-sdk-core/build.gradle | 2 +- rudder-sdk-core/maven.gradle | 2 +- .../java/com/rudderstack/android/sdk/core/RudderTraits.java | 1 + .../java/com/rudderstack/android/sample/kotlin/MainActivity.kt | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rudder-sdk-core/build.gradle b/rudder-sdk-core/build.gradle index 9190afe21..72bcd2d2d 100644 --- a/rudder-sdk-core/build.gradle +++ b/rudder-sdk-core/build.gradle @@ -19,7 +19,7 @@ android { minSdkVersion 14 targetSdkVersion 29 versionCode 1 - versionName "1.0-beta-01" + versionName "1.0.0.1" } buildTypes { diff --git a/rudder-sdk-core/maven.gradle b/rudder-sdk-core/maven.gradle index b3e609386..9d0bed93a 100644 --- a/rudder-sdk-core/maven.gradle +++ b/rudder-sdk-core/maven.gradle @@ -11,7 +11,7 @@ ext { siteUrl = 'https://github.com/rudderlabs/rudder-sdk-android' gitUrl = 'https://github.com/rudderlabs/rudder-sdk-android.git' - libraryVersion = '1.0-beta-01' + libraryVersion = '1.0.0.1' developerId = 'arnabp92' developerName = 'Arnab Pal' diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderTraits.java b/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderTraits.java index 54675014b..6e888a503 100644 --- a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderTraits.java +++ b/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderTraits.java @@ -295,6 +295,7 @@ public RudderTraits() { * @param userName String */ public RudderTraits(Address address, String age, String birthday, Company company, String createdAt, String description, String email, String firstName, String gender, String id, String lastName, String name, String phone, String title, String userName) { + this.anonymousId = RudderElementCache.getCachedContext().getDeviceId(); this.address = address; this.age = age; this.birthday = birthday; diff --git a/rudder-sdk-sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/MainActivity.kt b/rudder-sdk-sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/MainActivity.kt index 5e9b9d9b5..5b7613919 100644 --- a/rudder-sdk-sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/MainActivity.kt +++ b/rudder-sdk-sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/MainActivity.kt @@ -103,5 +103,7 @@ class MainActivity : AppCompatActivity() { .withShippingMethod("FedEx") .withStep(1) .build() + + rudderClient.identify("test_user_id") } } From 6e13619932e69a0c64ddb425458d7175a0fe9fcd Mon Sep 17 00:00:00 2001 From: arnab Date: Thu, 6 Feb 2020 11:52:11 +0530 Subject: [PATCH 03/23] updated readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index af533eb29..d461f9bd0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[ ![Download](https://api.bintray.com/packages/rudderstack/rudderstack/core/images/download.svg?version=1.0-beta-01) ](https://bintray.com/rudderstack/rudderstack/core/1.0-beta-01/link) +[ ![Download](https://api.bintray.com/packages/rudderstack/rudderstack/core/images/download.svg?version=1.0.0.1) ](https://bintray.com/rudderstack/rudderstack/core/1.0.0.1/link) # What is Rudder? @@ -22,7 +22,7 @@ repositories { ``` 2. Add the dependency under ```dependencies``` ``` -implementation 'com.rudderstack.android.sdk:core:1.0-beta-01' +implementation 'com.rudderstack.android.sdk:core:1.0.0.1' ``` ## Initialize ```RudderClient``` From 37fcb30a970975c4a65a07580976cf4d114f6030 Mon Sep 17 00:00:00 2001 From: arnab Date: Thu, 6 Feb 2020 12:36:22 +0530 Subject: [PATCH 04/23] Release of Version 1.0.0.2 --- {rudder-integration-dummy-impl => core}/.gitignore | 0 {rudder-sdk-core => core}/build.gradle | 0 {rudder-sdk-core => core}/maven.gradle | 2 +- .../proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../com/rudderstack/android/sdk/core/Constants.java | 0 .../android/sdk/core/DBPersistentManager.java | 0 .../android/sdk/core/EventRepository.java | 0 .../rudderstack/android/sdk/core/MessageType.java | 0 .../com/rudderstack/android/sdk/core/RudderApp.java | 0 .../rudderstack/android/sdk/core/RudderClient.java | 0 .../rudderstack/android/sdk/core/RudderConfig.java | 0 .../rudderstack/android/sdk/core/RudderContext.java | 0 .../android/sdk/core/RudderDeviceInfo.java | 0 .../android/sdk/core/RudderElementCache.java | 0 .../android/sdk/core/RudderIntegration.java | 0 .../android/sdk/core/RudderLibraryInfo.java | 0 .../rudderstack/android/sdk/core/RudderLogger.java | 0 .../rudderstack/android/sdk/core/RudderMessage.java | 0 .../android/sdk/core/RudderMessageBuilder.java | 0 .../rudderstack/android/sdk/core/RudderNetwork.java | 0 .../rudderstack/android/sdk/core/RudderOSInfo.java | 0 .../rudderstack/android/sdk/core/RudderOption.java | 0 .../android/sdk/core/RudderPreferenceManager.java | 0 .../android/sdk/core/RudderProperty.java | 0 .../android/sdk/core/RudderPropertyBuilder.java | 0 .../android/sdk/core/RudderScreenInfo.java | 0 .../android/sdk/core/RudderServerConfig.java | 0 .../android/sdk/core/RudderServerConfigManager.java | 0 .../android/sdk/core/RudderServerConfigSource.java | 0 .../android/sdk/core/RudderServerDestination.java | 0 .../sdk/core/RudderServerDestinationDefinition.java | 0 .../rudderstack/android/sdk/core/RudderTraits.java | 0 .../android/sdk/core/RudderTraitsBuilder.java | 0 .../android/sdk/core/RudderUserProperty.java | 0 .../android/sdk/core/ScreenPropertyBuilder.java | 0 .../android/sdk/core/TrackPropertyBuilder.java | 0 .../android/sdk/core/ecomm/ECommerceCart.java | 0 .../android/sdk/core/ecomm/ECommerceCheckout.java | 0 .../android/sdk/core/ecomm/ECommerceCoupon.java | 0 .../android/sdk/core/ecomm/ECommerceEvents.java | 0 .../android/sdk/core/ecomm/ECommerceFilter.java | 0 .../android/sdk/core/ecomm/ECommerceOrder.java | 0 .../android/sdk/core/ecomm/ECommerceParamNames.java | 0 .../android/sdk/core/ecomm/ECommerceProduct.java | 0 .../android/sdk/core/ecomm/ECommercePromotion.java | 0 .../sdk/core/ecomm/ECommercePropertyBuilder.java | 0 .../android/sdk/core/ecomm/ECommerceSort.java | 0 .../android/sdk/core/ecomm/ECommerceWishList.java | 0 .../sdk/core/ecomm/events/CartSharedEvent.java | 0 .../sdk/core/ecomm/events/CartViewedEvent.java | 0 .../sdk/core/ecomm/events/CheckoutStartedEvent.java | 0 .../ecomm/events/CheckoutStepCompletedEvent.java | 0 .../core/ecomm/events/CheckoutStepViewedEvent.java | 0 .../sdk/core/ecomm/events/CouponAppliedEvent.java | 0 .../sdk/core/ecomm/events/CouponDeniedEvent.java | 0 .../sdk/core/ecomm/events/CouponEnteredEvent.java | 0 .../sdk/core/ecomm/events/CouponRemovedEvent.java | 0 .../sdk/core/ecomm/events/OrderCancelledEvent.java | 0 .../sdk/core/ecomm/events/OrderCompletedEvent.java | 0 .../sdk/core/ecomm/events/OrderRefundedEvent.java | 0 .../sdk/core/ecomm/events/OrderUpdatedEvent.java | 0 .../core/ecomm/events/PaymentInfoEnteredEvent.java | 0 .../core/ecomm/events/ProductAddedToCartEvent.java | 0 .../ecomm/events/ProductAddedToWishListEvent.java | 0 .../sdk/core/ecomm/events/ProductClickedEvent.java | 0 .../core/ecomm/events/ProductListFilteredEvent.java | 0 .../core/ecomm/events/ProductListViewedEvent.java | 0 .../sdk/core/ecomm/events/ProductRemovedEvent.java | 0 .../events/ProductRemovedFromWishListEvent.java | 0 .../sdk/core/ecomm/events/ProductReviewedEvent.java | 0 .../sdk/core/ecomm/events/ProductSearchedEvent.java | 0 .../sdk/core/ecomm/events/ProductSharedEvent.java | 0 .../sdk/core/ecomm/events/ProductViewedEvent.java | 0 .../core/ecomm/events/PromotionClickedEvent.java | 0 .../sdk/core/ecomm/events/PromotionViewedEvent.java | 0 .../events/WishListProductAddedToCartEvent.java | 0 .../rudderstack/android/sdk/core/util/Utils.java | 0 .../src/main/res/values/strings.xml | 0 .../com/rudderstack/android/sdk/ExampleUnitTest.kt | 0 .../android/sdk/core/DBPersistentManagerTest.java | 0 .../android/sdk/core/RudderClientTest.java | 0 .../rudderstack/android/sdk/core/TestConstants.java | 0 {rudder-sdk-core => dummy-impl}/.gitignore | 0 .../build.gradle | 2 +- {rudder-sdk-core => dummy-impl}/proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../integration/dummy/DummyGAIntegration.java | 0 .../integration/dummy/DummyGAIntegrationImpl.java | 0 .../src/main/res/values/strings.xml | 0 .../.gitignore | 0 .../build.gradle | 4 ++-- .../proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../android/sample/kotlin/FirstActivity.kt | 0 .../android/sample/kotlin/MainActivity.kt | 0 .../android/sample/kotlin/MainApplication.kt | 0 .../android/sample/kotlin/SecondActivity.kt | 0 .../res/drawable-v24/ic_launcher_foreground.xml | 0 .../main/res/drawable/ic_launcher_background.xml | 0 .../src/main/res/layout/activity_first.xml | 0 .../src/main/res/layout/activity_main.xml | 0 .../src/main/res/layout/activity_second.xml | 0 .../src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../src/main/res/values/colors.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/styles.xml | 0 .../src/main/res/xml/network_security_config.xml | 0 .../.gitignore | 0 .../build.gradle | 2 +- .../proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../android/sample/segment/java/MainActivity.java | 0 .../sample/segment/java/MainApplication.java | 0 .../res/drawable-v24/ic_launcher_foreground.xml | 0 .../main/res/drawable/ic_launcher_background.xml | 0 .../src/main/res/layout/activity_main.xml | 0 .../src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../src/main/res/values/colors.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/styles.xml | 0 .../src/main/res/xml/network_security_config.xml | 0 settings.gradle | 2 +- 145 files changed, 6 insertions(+), 6 deletions(-) rename {rudder-integration-dummy-impl => core}/.gitignore (100%) rename {rudder-sdk-core => core}/build.gradle (100%) rename {rudder-sdk-core => core}/maven.gradle (98%) rename {rudder-integration-dummy-impl => core}/proguard-rules.pro (100%) rename {rudder-sdk-core => core}/src/main/AndroidManifest.xml (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/Constants.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/DBPersistentManager.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/EventRepository.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/MessageType.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderApp.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderClient.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderConfig.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderContext.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderDeviceInfo.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderElementCache.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderIntegration.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderLibraryInfo.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderLogger.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderMessage.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderMessageBuilder.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderNetwork.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderOSInfo.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderOption.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderPreferenceManager.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderProperty.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderPropertyBuilder.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderScreenInfo.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderServerConfig.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderServerConfigManager.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderServerConfigSource.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderServerDestination.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderServerDestinationDefinition.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderTraits.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderTraitsBuilder.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/RudderUserProperty.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ScreenPropertyBuilder.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/TrackPropertyBuilder.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceCart.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceCheckout.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceCoupon.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceEvents.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceFilter.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceOrder.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceParamNames.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceProduct.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommercePromotion.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommercePropertyBuilder.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceSort.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceWishList.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CartSharedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CartViewedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CheckoutStartedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CheckoutStepCompletedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CheckoutStepViewedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponAppliedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponDeniedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponEnteredEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponRemovedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderCancelledEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderCompletedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderRefundedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderUpdatedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/PaymentInfoEnteredEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductAddedToCartEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductAddedToWishListEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductClickedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductListFilteredEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductListViewedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductRemovedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductRemovedFromWishListEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductReviewedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductSearchedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductSharedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductViewedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/PromotionClickedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/PromotionViewedEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/WishListProductAddedToCartEvent.java (100%) rename {rudder-sdk-core => core}/src/main/java/com/rudderstack/android/sdk/core/util/Utils.java (100%) rename {rudder-integration-dummy-impl => core}/src/main/res/values/strings.xml (100%) rename {rudder-sdk-core => core}/src/test/java/com/rudderstack/android/sdk/ExampleUnitTest.kt (100%) rename {rudder-sdk-core => core}/src/test/java/com/rudderstack/android/sdk/core/DBPersistentManagerTest.java (100%) rename {rudder-sdk-core => core}/src/test/java/com/rudderstack/android/sdk/core/RudderClientTest.java (100%) rename {rudder-sdk-core => core}/src/test/java/com/rudderstack/android/sdk/core/TestConstants.java (100%) rename {rudder-sdk-core => dummy-impl}/.gitignore (100%) rename {rudder-integration-dummy-impl => dummy-impl}/build.gradle (95%) rename {rudder-sdk-core => dummy-impl}/proguard-rules.pro (100%) rename {rudder-integration-dummy-impl => dummy-impl}/src/main/AndroidManifest.xml (100%) rename {rudder-integration-dummy-impl => dummy-impl}/src/main/java/com/rudderstack/android/integration/dummy/DummyGAIntegration.java (100%) rename {rudder-integration-dummy-impl => dummy-impl}/src/main/java/com/rudderstack/android/integration/dummy/DummyGAIntegrationImpl.java (100%) rename {rudder-sdk-core => dummy-impl}/src/main/res/values/strings.xml (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/.gitignore (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/build.gradle (92%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/proguard-rules.pro (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/AndroidManifest.xml (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/java/com/rudderstack/android/sample/kotlin/FirstActivity.kt (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/java/com/rudderstack/android/sample/kotlin/MainActivity.kt (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/java/com/rudderstack/android/sample/kotlin/MainApplication.kt (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/java/com/rudderstack/android/sample/kotlin/SecondActivity.kt (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/drawable-v24/ic_launcher_foreground.xml (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/drawable/ic_launcher_background.xml (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/layout/activity_first.xml (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/layout/activity_main.xml (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/layout/activity_second.xml (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/values/colors.xml (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/values/strings.xml (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/values/styles.xml (100%) rename {rudder-sdk-sample-kotlin => sample-kotlin}/src/main/res/xml/network_security_config.xml (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/.gitignore (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/build.gradle (95%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/proguard-rules.pro (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/AndroidManifest.xml (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/java/com/rudderstack/android/sample/segment/java/MainActivity.java (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/java/com/rudderstack/android/sample/segment/java/MainApplication.java (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/res/drawable-v24/ic_launcher_foreground.xml (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/res/drawable/ic_launcher_background.xml (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/res/layout/activity_main.xml (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/res/values/colors.xml (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/res/values/strings.xml (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/res/values/styles.xml (100%) rename {rudder-sdk-sample-segment-java => sample-segment-java}/src/main/res/xml/network_security_config.xml (100%) diff --git a/rudder-integration-dummy-impl/.gitignore b/core/.gitignore similarity index 100% rename from rudder-integration-dummy-impl/.gitignore rename to core/.gitignore diff --git a/rudder-sdk-core/build.gradle b/core/build.gradle similarity index 100% rename from rudder-sdk-core/build.gradle rename to core/build.gradle diff --git a/rudder-sdk-core/maven.gradle b/core/maven.gradle similarity index 98% rename from rudder-sdk-core/maven.gradle rename to core/maven.gradle index 9d0bed93a..423a4410c 100644 --- a/rudder-sdk-core/maven.gradle +++ b/core/maven.gradle @@ -11,7 +11,7 @@ ext { siteUrl = 'https://github.com/rudderlabs/rudder-sdk-android' gitUrl = 'https://github.com/rudderlabs/rudder-sdk-android.git' - libraryVersion = '1.0.0.1' + libraryVersion = '1.0.0.2' developerId = 'arnabp92' developerName = 'Arnab Pal' diff --git a/rudder-integration-dummy-impl/proguard-rules.pro b/core/proguard-rules.pro similarity index 100% rename from rudder-integration-dummy-impl/proguard-rules.pro rename to core/proguard-rules.pro diff --git a/rudder-sdk-core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml similarity index 100% rename from rudder-sdk-core/src/main/AndroidManifest.xml rename to core/src/main/AndroidManifest.xml diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/Constants.java b/core/src/main/java/com/rudderstack/android/sdk/core/Constants.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/Constants.java rename to core/src/main/java/com/rudderstack/android/sdk/core/Constants.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/DBPersistentManager.java b/core/src/main/java/com/rudderstack/android/sdk/core/DBPersistentManager.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/DBPersistentManager.java rename to core/src/main/java/com/rudderstack/android/sdk/core/DBPersistentManager.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/EventRepository.java b/core/src/main/java/com/rudderstack/android/sdk/core/EventRepository.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/EventRepository.java rename to core/src/main/java/com/rudderstack/android/sdk/core/EventRepository.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/MessageType.java b/core/src/main/java/com/rudderstack/android/sdk/core/MessageType.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/MessageType.java rename to core/src/main/java/com/rudderstack/android/sdk/core/MessageType.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderApp.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderApp.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderApp.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderApp.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderClient.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderClient.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderClient.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderClient.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderConfig.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderConfig.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderConfig.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderConfig.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderContext.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderContext.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderContext.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderContext.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderDeviceInfo.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderDeviceInfo.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderDeviceInfo.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderDeviceInfo.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderElementCache.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderElementCache.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderElementCache.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderElementCache.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderIntegration.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderIntegration.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderIntegration.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderIntegration.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderLibraryInfo.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderLibraryInfo.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderLibraryInfo.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderLibraryInfo.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderLogger.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderLogger.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderLogger.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderLogger.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderMessage.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderMessage.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderMessage.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderMessage.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderMessageBuilder.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderMessageBuilder.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderMessageBuilder.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderMessageBuilder.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderNetwork.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderNetwork.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderNetwork.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderNetwork.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderOSInfo.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderOSInfo.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderOSInfo.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderOSInfo.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderOption.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderOption.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderOption.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderOption.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderPreferenceManager.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderPreferenceManager.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderPreferenceManager.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderPreferenceManager.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderProperty.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderProperty.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderProperty.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderProperty.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderPropertyBuilder.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderPropertyBuilder.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderPropertyBuilder.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderPropertyBuilder.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderScreenInfo.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderScreenInfo.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderScreenInfo.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderScreenInfo.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderServerConfig.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderServerConfig.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderServerConfig.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderServerConfig.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderServerConfigManager.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderServerConfigManager.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderServerConfigManager.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderServerConfigManager.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderServerConfigSource.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderServerConfigSource.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderServerConfigSource.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderServerConfigSource.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderServerDestination.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderServerDestination.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderServerDestination.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderServerDestination.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderServerDestinationDefinition.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderServerDestinationDefinition.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderServerDestinationDefinition.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderServerDestinationDefinition.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderTraits.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderTraits.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderTraits.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderTraits.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderTraitsBuilder.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderTraitsBuilder.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderTraitsBuilder.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderTraitsBuilder.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderUserProperty.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderUserProperty.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/RudderUserProperty.java rename to core/src/main/java/com/rudderstack/android/sdk/core/RudderUserProperty.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ScreenPropertyBuilder.java b/core/src/main/java/com/rudderstack/android/sdk/core/ScreenPropertyBuilder.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ScreenPropertyBuilder.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ScreenPropertyBuilder.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/TrackPropertyBuilder.java b/core/src/main/java/com/rudderstack/android/sdk/core/TrackPropertyBuilder.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/TrackPropertyBuilder.java rename to core/src/main/java/com/rudderstack/android/sdk/core/TrackPropertyBuilder.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceCart.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceCart.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceCart.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceCart.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceCheckout.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceCheckout.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceCheckout.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceCheckout.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceCoupon.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceCoupon.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceCoupon.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceCoupon.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceEvents.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceEvents.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceEvents.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceEvents.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceFilter.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceFilter.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceFilter.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceFilter.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceOrder.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceOrder.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceOrder.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceOrder.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceParamNames.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceParamNames.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceParamNames.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceParamNames.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceProduct.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceProduct.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceProduct.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceProduct.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommercePromotion.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommercePromotion.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommercePromotion.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommercePromotion.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommercePropertyBuilder.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommercePropertyBuilder.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommercePropertyBuilder.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommercePropertyBuilder.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceSort.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceSort.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceSort.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceSort.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceWishList.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceWishList.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceWishList.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/ECommerceWishList.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CartSharedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CartSharedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CartSharedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CartSharedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CartViewedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CartViewedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CartViewedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CartViewedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CheckoutStartedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CheckoutStartedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CheckoutStartedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CheckoutStartedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CheckoutStepCompletedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CheckoutStepCompletedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CheckoutStepCompletedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CheckoutStepCompletedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CheckoutStepViewedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CheckoutStepViewedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CheckoutStepViewedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CheckoutStepViewedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponAppliedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponAppliedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponAppliedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponAppliedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponDeniedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponDeniedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponDeniedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponDeniedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponEnteredEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponEnteredEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponEnteredEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponEnteredEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponRemovedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponRemovedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponRemovedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/CouponRemovedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderCancelledEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderCancelledEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderCancelledEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderCancelledEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderCompletedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderCompletedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderCompletedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderCompletedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderRefundedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderRefundedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderRefundedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderRefundedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderUpdatedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderUpdatedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderUpdatedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/OrderUpdatedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/PaymentInfoEnteredEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/PaymentInfoEnteredEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/PaymentInfoEnteredEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/PaymentInfoEnteredEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductAddedToCartEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductAddedToCartEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductAddedToCartEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductAddedToCartEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductAddedToWishListEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductAddedToWishListEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductAddedToWishListEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductAddedToWishListEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductClickedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductClickedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductClickedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductClickedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductListFilteredEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductListFilteredEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductListFilteredEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductListFilteredEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductListViewedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductListViewedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductListViewedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductListViewedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductRemovedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductRemovedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductRemovedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductRemovedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductRemovedFromWishListEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductRemovedFromWishListEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductRemovedFromWishListEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductRemovedFromWishListEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductReviewedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductReviewedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductReviewedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductReviewedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductSearchedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductSearchedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductSearchedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductSearchedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductSharedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductSharedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductSharedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductSharedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductViewedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductViewedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductViewedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/ProductViewedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/PromotionClickedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/PromotionClickedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/PromotionClickedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/PromotionClickedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/PromotionViewedEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/PromotionViewedEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/PromotionViewedEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/PromotionViewedEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/WishListProductAddedToCartEvent.java b/core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/WishListProductAddedToCartEvent.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/WishListProductAddedToCartEvent.java rename to core/src/main/java/com/rudderstack/android/sdk/core/ecomm/events/WishListProductAddedToCartEvent.java diff --git a/rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/util/Utils.java b/core/src/main/java/com/rudderstack/android/sdk/core/util/Utils.java similarity index 100% rename from rudder-sdk-core/src/main/java/com/rudderstack/android/sdk/core/util/Utils.java rename to core/src/main/java/com/rudderstack/android/sdk/core/util/Utils.java diff --git a/rudder-integration-dummy-impl/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml similarity index 100% rename from rudder-integration-dummy-impl/src/main/res/values/strings.xml rename to core/src/main/res/values/strings.xml diff --git a/rudder-sdk-core/src/test/java/com/rudderstack/android/sdk/ExampleUnitTest.kt b/core/src/test/java/com/rudderstack/android/sdk/ExampleUnitTest.kt similarity index 100% rename from rudder-sdk-core/src/test/java/com/rudderstack/android/sdk/ExampleUnitTest.kt rename to core/src/test/java/com/rudderstack/android/sdk/ExampleUnitTest.kt diff --git a/rudder-sdk-core/src/test/java/com/rudderstack/android/sdk/core/DBPersistentManagerTest.java b/core/src/test/java/com/rudderstack/android/sdk/core/DBPersistentManagerTest.java similarity index 100% rename from rudder-sdk-core/src/test/java/com/rudderstack/android/sdk/core/DBPersistentManagerTest.java rename to core/src/test/java/com/rudderstack/android/sdk/core/DBPersistentManagerTest.java diff --git a/rudder-sdk-core/src/test/java/com/rudderstack/android/sdk/core/RudderClientTest.java b/core/src/test/java/com/rudderstack/android/sdk/core/RudderClientTest.java similarity index 100% rename from rudder-sdk-core/src/test/java/com/rudderstack/android/sdk/core/RudderClientTest.java rename to core/src/test/java/com/rudderstack/android/sdk/core/RudderClientTest.java diff --git a/rudder-sdk-core/src/test/java/com/rudderstack/android/sdk/core/TestConstants.java b/core/src/test/java/com/rudderstack/android/sdk/core/TestConstants.java similarity index 100% rename from rudder-sdk-core/src/test/java/com/rudderstack/android/sdk/core/TestConstants.java rename to core/src/test/java/com/rudderstack/android/sdk/core/TestConstants.java diff --git a/rudder-sdk-core/.gitignore b/dummy-impl/.gitignore similarity index 100% rename from rudder-sdk-core/.gitignore rename to dummy-impl/.gitignore diff --git a/rudder-integration-dummy-impl/build.gradle b/dummy-impl/build.gradle similarity index 95% rename from rudder-integration-dummy-impl/build.gradle rename to dummy-impl/build.gradle index bd9c084b0..921237d5c 100644 --- a/rudder-integration-dummy-impl/build.gradle +++ b/dummy-impl/build.gradle @@ -28,7 +28,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - compileOnly project(':rudder-sdk-core') + compileOnly project(':core') implementation 'com.google.code.gson:gson:2.8.6' testImplementation 'com.android.support.test:rules:1.0.2' diff --git a/rudder-sdk-core/proguard-rules.pro b/dummy-impl/proguard-rules.pro similarity index 100% rename from rudder-sdk-core/proguard-rules.pro rename to dummy-impl/proguard-rules.pro diff --git a/rudder-integration-dummy-impl/src/main/AndroidManifest.xml b/dummy-impl/src/main/AndroidManifest.xml similarity index 100% rename from rudder-integration-dummy-impl/src/main/AndroidManifest.xml rename to dummy-impl/src/main/AndroidManifest.xml diff --git a/rudder-integration-dummy-impl/src/main/java/com/rudderstack/android/integration/dummy/DummyGAIntegration.java b/dummy-impl/src/main/java/com/rudderstack/android/integration/dummy/DummyGAIntegration.java similarity index 100% rename from rudder-integration-dummy-impl/src/main/java/com/rudderstack/android/integration/dummy/DummyGAIntegration.java rename to dummy-impl/src/main/java/com/rudderstack/android/integration/dummy/DummyGAIntegration.java diff --git a/rudder-integration-dummy-impl/src/main/java/com/rudderstack/android/integration/dummy/DummyGAIntegrationImpl.java b/dummy-impl/src/main/java/com/rudderstack/android/integration/dummy/DummyGAIntegrationImpl.java similarity index 100% rename from rudder-integration-dummy-impl/src/main/java/com/rudderstack/android/integration/dummy/DummyGAIntegrationImpl.java rename to dummy-impl/src/main/java/com/rudderstack/android/integration/dummy/DummyGAIntegrationImpl.java diff --git a/rudder-sdk-core/src/main/res/values/strings.xml b/dummy-impl/src/main/res/values/strings.xml similarity index 100% rename from rudder-sdk-core/src/main/res/values/strings.xml rename to dummy-impl/src/main/res/values/strings.xml diff --git a/rudder-sdk-sample-kotlin/.gitignore b/sample-kotlin/.gitignore similarity index 100% rename from rudder-sdk-sample-kotlin/.gitignore rename to sample-kotlin/.gitignore diff --git a/rudder-sdk-sample-kotlin/build.gradle b/sample-kotlin/build.gradle similarity index 92% rename from rudder-sdk-sample-kotlin/build.gradle rename to sample-kotlin/build.gradle index 588307a0f..b5535f734 100644 --- a/rudder-sdk-sample-kotlin/build.gradle +++ b/sample-kotlin/build.gradle @@ -40,8 +40,8 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'com.google.android.material:material:1.0.0' - implementation project(':rudder-sdk-core') - implementation project(':rudder-integration-dummy-impl') + implementation project(':core') + implementation project(':dummy-impl') testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test:runner:1.2.0' diff --git a/rudder-sdk-sample-kotlin/proguard-rules.pro b/sample-kotlin/proguard-rules.pro similarity index 100% rename from rudder-sdk-sample-kotlin/proguard-rules.pro rename to sample-kotlin/proguard-rules.pro diff --git a/rudder-sdk-sample-kotlin/src/main/AndroidManifest.xml b/sample-kotlin/src/main/AndroidManifest.xml similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/AndroidManifest.xml rename to sample-kotlin/src/main/AndroidManifest.xml diff --git a/rudder-sdk-sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/FirstActivity.kt b/sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/FirstActivity.kt similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/FirstActivity.kt rename to sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/FirstActivity.kt diff --git a/rudder-sdk-sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/MainActivity.kt b/sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/MainActivity.kt similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/MainActivity.kt rename to sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/MainActivity.kt diff --git a/rudder-sdk-sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/MainApplication.kt b/sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/MainApplication.kt similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/MainApplication.kt rename to sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/MainApplication.kt diff --git a/rudder-sdk-sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/SecondActivity.kt b/sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/SecondActivity.kt similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/SecondActivity.kt rename to sample-kotlin/src/main/java/com/rudderstack/android/sample/kotlin/SecondActivity.kt diff --git a/rudder-sdk-sample-kotlin/src/main/res/drawable-v24/ic_launcher_foreground.xml b/sample-kotlin/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to sample-kotlin/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/rudder-sdk-sample-kotlin/src/main/res/drawable/ic_launcher_background.xml b/sample-kotlin/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/drawable/ic_launcher_background.xml rename to sample-kotlin/src/main/res/drawable/ic_launcher_background.xml diff --git a/rudder-sdk-sample-kotlin/src/main/res/layout/activity_first.xml b/sample-kotlin/src/main/res/layout/activity_first.xml similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/layout/activity_first.xml rename to sample-kotlin/src/main/res/layout/activity_first.xml diff --git a/rudder-sdk-sample-kotlin/src/main/res/layout/activity_main.xml b/sample-kotlin/src/main/res/layout/activity_main.xml similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/layout/activity_main.xml rename to sample-kotlin/src/main/res/layout/activity_main.xml diff --git a/rudder-sdk-sample-kotlin/src/main/res/layout/activity_second.xml b/sample-kotlin/src/main/res/layout/activity_second.xml similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/layout/activity_second.xml rename to sample-kotlin/src/main/res/layout/activity_second.xml diff --git a/rudder-sdk-sample-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/sample-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to sample-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/rudder-sdk-sample-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/sample-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to sample-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/rudder-sdk-sample-kotlin/src/main/res/mipmap-hdpi/ic_launcher.png b/sample-kotlin/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/mipmap-hdpi/ic_launcher.png rename to sample-kotlin/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/rudder-sdk-sample-kotlin/src/main/res/mipmap-hdpi/ic_launcher_round.png b/sample-kotlin/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to sample-kotlin/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/rudder-sdk-sample-kotlin/src/main/res/mipmap-mdpi/ic_launcher.png b/sample-kotlin/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/mipmap-mdpi/ic_launcher.png rename to sample-kotlin/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/rudder-sdk-sample-kotlin/src/main/res/mipmap-mdpi/ic_launcher_round.png b/sample-kotlin/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to sample-kotlin/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/rudder-sdk-sample-kotlin/src/main/res/mipmap-xhdpi/ic_launcher.png b/sample-kotlin/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/mipmap-xhdpi/ic_launcher.png rename to sample-kotlin/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/rudder-sdk-sample-kotlin/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/sample-kotlin/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to sample-kotlin/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/rudder-sdk-sample-kotlin/src/main/res/mipmap-xxhdpi/ic_launcher.png b/sample-kotlin/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to sample-kotlin/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/rudder-sdk-sample-kotlin/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/sample-kotlin/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to sample-kotlin/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/rudder-sdk-sample-kotlin/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/sample-kotlin/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to sample-kotlin/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/rudder-sdk-sample-kotlin/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/sample-kotlin/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to sample-kotlin/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/rudder-sdk-sample-kotlin/src/main/res/values/colors.xml b/sample-kotlin/src/main/res/values/colors.xml similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/values/colors.xml rename to sample-kotlin/src/main/res/values/colors.xml diff --git a/rudder-sdk-sample-kotlin/src/main/res/values/strings.xml b/sample-kotlin/src/main/res/values/strings.xml similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/values/strings.xml rename to sample-kotlin/src/main/res/values/strings.xml diff --git a/rudder-sdk-sample-kotlin/src/main/res/values/styles.xml b/sample-kotlin/src/main/res/values/styles.xml similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/values/styles.xml rename to sample-kotlin/src/main/res/values/styles.xml diff --git a/rudder-sdk-sample-kotlin/src/main/res/xml/network_security_config.xml b/sample-kotlin/src/main/res/xml/network_security_config.xml similarity index 100% rename from rudder-sdk-sample-kotlin/src/main/res/xml/network_security_config.xml rename to sample-kotlin/src/main/res/xml/network_security_config.xml diff --git a/rudder-sdk-sample-segment-java/.gitignore b/sample-segment-java/.gitignore similarity index 100% rename from rudder-sdk-sample-segment-java/.gitignore rename to sample-segment-java/.gitignore diff --git a/rudder-sdk-sample-segment-java/build.gradle b/sample-segment-java/build.gradle similarity index 95% rename from rudder-sdk-sample-segment-java/build.gradle rename to sample-segment-java/build.gradle index 384b31eb8..afedaec28 100644 --- a/rudder-sdk-sample-segment-java/build.gradle +++ b/sample-segment-java/build.gradle @@ -25,7 +25,7 @@ dependencies { implementation 'androidx.core:core-ktx:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation project(':rudder-sdk-core') + implementation project(':core') testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test:runner:1.2.0' diff --git a/rudder-sdk-sample-segment-java/proguard-rules.pro b/sample-segment-java/proguard-rules.pro similarity index 100% rename from rudder-sdk-sample-segment-java/proguard-rules.pro rename to sample-segment-java/proguard-rules.pro diff --git a/rudder-sdk-sample-segment-java/src/main/AndroidManifest.xml b/sample-segment-java/src/main/AndroidManifest.xml similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/AndroidManifest.xml rename to sample-segment-java/src/main/AndroidManifest.xml diff --git a/rudder-sdk-sample-segment-java/src/main/java/com/rudderstack/android/sample/segment/java/MainActivity.java b/sample-segment-java/src/main/java/com/rudderstack/android/sample/segment/java/MainActivity.java similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/java/com/rudderstack/android/sample/segment/java/MainActivity.java rename to sample-segment-java/src/main/java/com/rudderstack/android/sample/segment/java/MainActivity.java diff --git a/rudder-sdk-sample-segment-java/src/main/java/com/rudderstack/android/sample/segment/java/MainApplication.java b/sample-segment-java/src/main/java/com/rudderstack/android/sample/segment/java/MainApplication.java similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/java/com/rudderstack/android/sample/segment/java/MainApplication.java rename to sample-segment-java/src/main/java/com/rudderstack/android/sample/segment/java/MainApplication.java diff --git a/rudder-sdk-sample-segment-java/src/main/res/drawable-v24/ic_launcher_foreground.xml b/sample-segment-java/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to sample-segment-java/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/rudder-sdk-sample-segment-java/src/main/res/drawable/ic_launcher_background.xml b/sample-segment-java/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/res/drawable/ic_launcher_background.xml rename to sample-segment-java/src/main/res/drawable/ic_launcher_background.xml diff --git a/rudder-sdk-sample-segment-java/src/main/res/layout/activity_main.xml b/sample-segment-java/src/main/res/layout/activity_main.xml similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/res/layout/activity_main.xml rename to sample-segment-java/src/main/res/layout/activity_main.xml diff --git a/rudder-sdk-sample-segment-java/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/sample-segment-java/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to sample-segment-java/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/rudder-sdk-sample-segment-java/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/sample-segment-java/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to sample-segment-java/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/rudder-sdk-sample-segment-java/src/main/res/mipmap-hdpi/ic_launcher.png b/sample-segment-java/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/res/mipmap-hdpi/ic_launcher.png rename to sample-segment-java/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/rudder-sdk-sample-segment-java/src/main/res/mipmap-hdpi/ic_launcher_round.png b/sample-segment-java/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to sample-segment-java/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/rudder-sdk-sample-segment-java/src/main/res/mipmap-mdpi/ic_launcher.png b/sample-segment-java/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/res/mipmap-mdpi/ic_launcher.png rename to sample-segment-java/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/rudder-sdk-sample-segment-java/src/main/res/mipmap-mdpi/ic_launcher_round.png b/sample-segment-java/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to sample-segment-java/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/rudder-sdk-sample-segment-java/src/main/res/mipmap-xhdpi/ic_launcher.png b/sample-segment-java/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/res/mipmap-xhdpi/ic_launcher.png rename to sample-segment-java/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/rudder-sdk-sample-segment-java/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/sample-segment-java/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to sample-segment-java/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/rudder-sdk-sample-segment-java/src/main/res/mipmap-xxhdpi/ic_launcher.png b/sample-segment-java/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to sample-segment-java/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/rudder-sdk-sample-segment-java/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/sample-segment-java/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to sample-segment-java/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/rudder-sdk-sample-segment-java/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/sample-segment-java/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to sample-segment-java/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/rudder-sdk-sample-segment-java/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/sample-segment-java/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to sample-segment-java/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/rudder-sdk-sample-segment-java/src/main/res/values/colors.xml b/sample-segment-java/src/main/res/values/colors.xml similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/res/values/colors.xml rename to sample-segment-java/src/main/res/values/colors.xml diff --git a/rudder-sdk-sample-segment-java/src/main/res/values/strings.xml b/sample-segment-java/src/main/res/values/strings.xml similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/res/values/strings.xml rename to sample-segment-java/src/main/res/values/strings.xml diff --git a/rudder-sdk-sample-segment-java/src/main/res/values/styles.xml b/sample-segment-java/src/main/res/values/styles.xml similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/res/values/styles.xml rename to sample-segment-java/src/main/res/values/styles.xml diff --git a/rudder-sdk-sample-segment-java/src/main/res/xml/network_security_config.xml b/sample-segment-java/src/main/res/xml/network_security_config.xml similarity index 100% rename from rudder-sdk-sample-segment-java/src/main/res/xml/network_security_config.xml rename to sample-segment-java/src/main/res/xml/network_security_config.xml diff --git a/settings.gradle b/settings.gradle index e3c6c4d85..b33bc84e7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':rudder-sdk-sample-kotlin', ':rudder-sdk-core', ':rudder-sdk-sample-segment-java', ':rudder-integration-dummy-impl' \ No newline at end of file +include 'sample-kotlin', ':core', ':sample-segment-java', ':dummy-impl' \ No newline at end of file From c3618ae4d11da8c56cfb6b225d169d8d5b903eed Mon Sep 17 00:00:00 2001 From: arnab Date: Thu, 6 Feb 2020 12:42:40 +0530 Subject: [PATCH 05/23] Updated Readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d461f9bd0..5ac0e7f03 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[ ![Download](https://api.bintray.com/packages/rudderstack/rudderstack/core/images/download.svg?version=1.0.0.1) ](https://bintray.com/rudderstack/rudderstack/core/1.0.0.1/link) +[ ![Download](https://api.bintray.com/packages/rudderstack/rudderstack/core/images/download.svg?version=1.0.0.2) ](https://bintray.com/rudderstack/rudderstack/core/1.0.0.2/link) # What is Rudder? @@ -22,7 +22,7 @@ repositories { ``` 2. Add the dependency under ```dependencies``` ``` -implementation 'com.rudderstack.android.sdk:core:1.0.0.1' +implementation 'com.rudderstack.android.sdk:core:1.0.0.2' ``` ## Initialize ```RudderClient``` From fbe2117b50e870ac874604e76db4bde9e8bd8861 Mon Sep 17 00:00:00 2001 From: arnab Date: Tue, 18 Feb 2020 11:37:57 +0530 Subject: [PATCH 06/23] Removed duplicate files --- integration-dummy-impl/.gitignore | 1 - integration-dummy-impl/build.gradle | 38 ---------- integration-dummy-impl/proguard-rules.pro | 21 ----- .../src/main/AndroidManifest.xml | 6 -- .../integration/dummy/DummyGAIntegration.java | 31 -------- .../dummy/DummyGAIntegrationImpl.java | 76 ------------------- .../src/main/res/values/strings.xml | 3 - 7 files changed, 176 deletions(-) delete mode 100644 integration-dummy-impl/.gitignore delete mode 100644 integration-dummy-impl/build.gradle delete mode 100644 integration-dummy-impl/proguard-rules.pro delete mode 100644 integration-dummy-impl/src/main/AndroidManifest.xml delete mode 100644 integration-dummy-impl/src/main/java/com/rudderstack/android/integration/dummy/DummyGAIntegration.java delete mode 100644 integration-dummy-impl/src/main/java/com/rudderstack/android/integration/dummy/DummyGAIntegrationImpl.java delete mode 100644 integration-dummy-impl/src/main/res/values/strings.xml diff --git a/integration-dummy-impl/.gitignore b/integration-dummy-impl/.gitignore deleted file mode 100644 index 796b96d1c..000000000 --- a/integration-dummy-impl/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/integration-dummy-impl/build.gradle b/integration-dummy-impl/build.gradle deleted file mode 100644 index 921237d5c..000000000 --- a/integration-dummy-impl/build.gradle +++ /dev/null @@ -1,38 +0,0 @@ -buildscript { - repositories { - jcenter() - } -} - -apply plugin: 'com.android.library' - -android { - compileSdkVersion 29 - buildToolsVersion "29.0.2" - - defaultConfig { - minSdkVersion 14 - targetSdkVersion 29 - versionCode 1 - versionName "1.0" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - - compileOnly project(':core') - implementation 'com.google.code.gson:gson:2.8.6' - - testImplementation 'com.android.support.test:rules:1.0.2' - testImplementation 'com.android.support.test:runner:1.0.2' - testImplementation "org.robolectric:robolectric:4.3" - testImplementation "androidx.test:core-ktx:1.2.0" -} \ No newline at end of file diff --git a/integration-dummy-impl/proguard-rules.pro b/integration-dummy-impl/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/integration-dummy-impl/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/integration-dummy-impl/src/main/AndroidManifest.xml b/integration-dummy-impl/src/main/AndroidManifest.xml deleted file mode 100644 index ccea5742f..000000000 --- a/integration-dummy-impl/src/main/AndroidManifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/integration-dummy-impl/src/main/java/com/rudderstack/android/integration/dummy/DummyGAIntegration.java b/integration-dummy-impl/src/main/java/com/rudderstack/android/integration/dummy/DummyGAIntegration.java deleted file mode 100644 index 6a05fbf86..000000000 --- a/integration-dummy-impl/src/main/java/com/rudderstack/android/integration/dummy/DummyGAIntegration.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.rudderstack.android.integration.dummy; - -import android.app.Application; -import android.content.Context; - -import org.json.JSONObject; - -public class DummyGAIntegration { - private static DummyGAIntegration instance; - - private Application application; - private String key; - - private DummyGAIntegration(Context context, String key) { - this.application = (Application) context.getApplicationContext(); - this.key = key; - } - - public static DummyGAIntegration getInstance(Context context, String key) { - if (instance == null) { - instance = new DummyGAIntegration(context, key); - - System.out.println("DummyGAIntegration is initialized with key " + key); - } - return instance; - } - - public void dumpEvent(String eventName, String eventType, String userId, JSONObject eventProps, JSONObject userProps) { - System.out.println(eventName + " event has been dumped with DummyGAIntegration"); - } -} diff --git a/integration-dummy-impl/src/main/java/com/rudderstack/android/integration/dummy/DummyGAIntegrationImpl.java b/integration-dummy-impl/src/main/java/com/rudderstack/android/integration/dummy/DummyGAIntegrationImpl.java deleted file mode 100644 index ba8011d5f..000000000 --- a/integration-dummy-impl/src/main/java/com/rudderstack/android/integration/dummy/DummyGAIntegrationImpl.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.rudderstack.android.integration.dummy; - -import com.google.gson.Gson; -import com.rudderstack.android.sdk.core.RudderClient; -import com.rudderstack.android.sdk.core.RudderConfig; -import com.rudderstack.android.sdk.core.RudderIntegration; -import com.rudderstack.android.sdk.core.RudderMessage; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.util.Map; - -public class DummyGAIntegrationImpl extends RudderIntegration { - private DummyGAIntegration integration; - static final String DUMMY_KEY = "Adjust"; - static final String DUMMY_DISPLAY_NAME = "Dummy AM Integration"; - private static final String DUMMY_TYPE = "type"; - - public static Factory FACTORY = new Factory() { - @Override - public RudderIntegration create(Object settings, RudderClient client, RudderConfig config) { - return new DummyGAIntegrationImpl(settings, client); - } - - @Override - public String key() { - return DUMMY_KEY; - } - }; - - private DummyGAIntegrationImpl(Object settings, RudderClient client) { - Map settingsMap = (Map) settings; - String key = settingsMap.get("apiKey"); - integration = DummyGAIntegration.getInstance(client.getApplication(), key); - } - - @Override - public void reset() { - // nothing to do - } - - @Override - public void dump(RudderMessage message) { - try { - String eventName = message.getEventName(); - String eventType = message.getType(); - String userId = message.getUserId(); - Map eventProps = message.getProperties(); - String eventJson = new Gson().toJson(eventProps); - System.out.println("eventJson: " + eventJson); - JSONObject eventObject = new JSONObject(eventJson); - Map userProps = message.getUserProperties(); - JSONObject userObject = null; - if (userProps != null) { - String userJson = new Gson().toJson(userProps); - System.out.println("userJson: " + userJson); - userObject = new JSONObject(userJson); - } - integration.dumpEvent( - eventName, - eventType, - userId, - eventObject, - userObject - ); - } catch (JSONException ex) { - ex.printStackTrace(); - } - } - - @Override - public DummyGAIntegration getUnderlyingInstance() { - return integration; - } -} diff --git a/integration-dummy-impl/src/main/res/values/strings.xml b/integration-dummy-impl/src/main/res/values/strings.xml deleted file mode 100644 index 7e6f0701f..000000000 --- a/integration-dummy-impl/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - RudderAndroidSdkCore - From 02a7ad371e8db23e03f48117326c9bd2985b4278 Mon Sep 17 00:00:00 2001 From: arnab Date: Tue, 18 Feb 2020 11:39:31 +0530 Subject: [PATCH 07/23] Updated Readme --- README.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/README.md b/README.md index fb9906109..5ac0e7f03 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,4 @@ -<<<<<<< HEAD -[ ![Download](https://api.bintray.com/packages/rudderstack/rudderstack/core/images/download.svg?version=1.0) ](https://bintray.com/rudderstack/rudderstack/core/1.0/link) -======= [ ![Download](https://api.bintray.com/packages/rudderstack/rudderstack/core/images/download.svg?version=1.0.0.2) ](https://bintray.com/rudderstack/rudderstack/core/1.0.0.2/link) ->>>>>>> c3618ae4d11da8c56cfb6b225d169d8d5b903eed # What is Rudder? @@ -26,11 +22,7 @@ repositories { ``` 2. Add the dependency under ```dependencies``` ``` -<<<<<<< HEAD -implementation 'com.rudderstack.android.sdk:core:1.0' -======= implementation 'com.rudderstack.android.sdk:core:1.0.0.2' ->>>>>>> c3618ae4d11da8c56cfb6b225d169d8d5b903eed ``` ## Initialize ```RudderClient``` From e7dc3eddefa4572c523ba344dc8272f47b5435b0 Mon Sep 17 00:00:00 2001 From: Arnab Date: Tue, 18 Feb 2020 11:50:23 +0530 Subject: [PATCH 08/23] Support for configuring config-plane-url through RudderConfig (#25) * Support for configuring config-plane-url through RudderConfig * Separate application for testing native SDK integrations --- .../android/sdk/core/Constants.java | 1 - .../android/sdk/core/RudderConfig.java | 42 ++++++- .../android/sdk/core/RudderLogger.java | 12 +- .../sdk/core/RudderServerConfigManager.java | 2 +- sample-kotlin-integration/.gitignore | 1 + sample-kotlin-integration/build.gradle | 48 ++++++++ sample-kotlin-integration/proguard-rules.pro | 21 ++++ .../src/main/AndroidManifest.xml | 25 ++++ .../android/sample/kotlin/FirstActivity.kt | 17 +++ .../android/sample/kotlin/MainActivity.kt | 107 ++++++++++++++++++ .../android/sample/kotlin/MainApplication.kt | 82 ++++++++++++++ .../android/sample/kotlin/SecondActivity.kt | 11 ++ .../drawable-v24/ic_launcher_foreground.xml | 34 ++++++ .../res/drawable/ic_launcher_background.xml | 74 ++++++++++++ .../src/main/res/layout/activity_first.xml | 13 +++ .../src/main/res/layout/activity_main.xml | 93 +++++++++++++++ .../src/main/res/layout/activity_second.xml | 12 ++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 + .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 2963 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 4905 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2060 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 2783 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4490 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 6895 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 6387 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 10413 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 9128 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 15132 bytes .../src/main/res/values/colors.xml | 6 + .../src/main/res/values/strings.xml | 3 + .../src/main/res/values/styles.xml | 11 ++ .../main/res/xml/network_security_config.xml | 6 + sample-kotlin/build.gradle | 9 +- .../android/sample/kotlin/MainActivity.kt | 2 +- .../android/sample/kotlin/MainApplication.kt | 6 +- settings.gradle | 6 +- 37 files changed, 631 insertions(+), 23 deletions(-) create mode 100644 sample-kotlin-integration/.gitignore create mode 100644 sample-kotlin-integration/build.gradle create mode 100644 sample-kotlin-integration/proguard-rules.pro create mode 100644 sample-kotlin-integration/src/main/AndroidManifest.xml create mode 100644 sample-kotlin-integration/src/main/java/com/rudderstack/android/sample/kotlin/FirstActivity.kt create mode 100644 sample-kotlin-integration/src/main/java/com/rudderstack/android/sample/kotlin/MainActivity.kt create mode 100644 sample-kotlin-integration/src/main/java/com/rudderstack/android/sample/kotlin/MainApplication.kt create mode 100644 sample-kotlin-integration/src/main/java/com/rudderstack/android/sample/kotlin/SecondActivity.kt create mode 100644 sample-kotlin-integration/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 sample-kotlin-integration/src/main/res/drawable/ic_launcher_background.xml create mode 100644 sample-kotlin-integration/src/main/res/layout/activity_first.xml create mode 100644 sample-kotlin-integration/src/main/res/layout/activity_main.xml create mode 100644 sample-kotlin-integration/src/main/res/layout/activity_second.xml create mode 100644 sample-kotlin-integration/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 sample-kotlin-integration/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 sample-kotlin-integration/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 sample-kotlin-integration/src/main/res/mipmap-hdpi/ic_launcher_round.png create mode 100644 sample-kotlin-integration/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 sample-kotlin-integration/src/main/res/mipmap-mdpi/ic_launcher_round.png create mode 100644 sample-kotlin-integration/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 sample-kotlin-integration/src/main/res/mipmap-xhdpi/ic_launcher_round.png create mode 100644 sample-kotlin-integration/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 sample-kotlin-integration/src/main/res/mipmap-xxhdpi/ic_launcher_round.png create mode 100644 sample-kotlin-integration/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 sample-kotlin-integration/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png create mode 100644 sample-kotlin-integration/src/main/res/values/colors.xml create mode 100644 sample-kotlin-integration/src/main/res/values/strings.xml create mode 100644 sample-kotlin-integration/src/main/res/values/styles.xml create mode 100644 sample-kotlin-integration/src/main/res/xml/network_security_config.xml diff --git a/core/src/main/java/com/rudderstack/android/sdk/core/Constants.java b/core/src/main/java/com/rudderstack/android/sdk/core/Constants.java index 029aceef6..a6171e571 100644 --- a/core/src/main/java/com/rudderstack/android/sdk/core/Constants.java +++ b/core/src/main/java/com/rudderstack/android/sdk/core/Constants.java @@ -18,7 +18,6 @@ class Constants { static final int SLEEP_TIMEOUT = 10; // config-plane url to get the config for the writeKey static final String CONFIG_PLANE_URL = "https://api.rudderlabs.com"; -// static final String CONFIG_PLANE_URL = "https://f7572250.ngrok.io"; // whether we should trackLifecycle events static final boolean TRACK_LIFECYCLE_EVENTS = true; // whether we should record screen views automatically diff --git a/core/src/main/java/com/rudderstack/android/sdk/core/RudderConfig.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderConfig.java index 6611c834c..eaefc748f 100644 --- a/core/src/main/java/com/rudderstack/android/sdk/core/RudderConfig.java +++ b/core/src/main/java/com/rudderstack/android/sdk/core/RudderConfig.java @@ -36,6 +36,7 @@ public class RudderConfig { private int configRefreshInterval; private boolean trackLifecycleEvents; private boolean recordScreenViews; + private String configPlaneUrl; private List factories; RudderConfig() { @@ -48,6 +49,7 @@ public class RudderConfig { Constants.CONFIG_REFRESH_INTERVAL, Constants.TRACK_LIFECYCLE_EVENTS, Constants.RECORD_SCREEN_VIEWS, + Constants.CONFIG_PLANE_URL, null ); } @@ -61,6 +63,7 @@ private RudderConfig( int configRefreshInterval, boolean trackLifecycleEvents, boolean recordScreenViews, + String configPlaneUrl, List factories ) { RudderLogger.init(logLevel); @@ -113,6 +116,17 @@ private RudderConfig( if (factories != null && !factories.isEmpty()) { this.factories = factories; } + + if (TextUtils.isEmpty(configPlaneUrl)) { + RudderLogger.logError("configPlaneUrl can not be null or empty. Set to default."); + this.configPlaneUrl = Constants.CONFIG_PLANE_URL; + } else if (!URLUtil.isValidUrl(configPlaneUrl)) { + RudderLogger.logError("Malformed configPlaneUrl. Set to default"); + this.configPlaneUrl = Constants.CONFIG_PLANE_URL; + } else { + if (!configPlaneUrl.endsWith("/")) configPlaneUrl += "/"; + this.configPlaneUrl = configPlaneUrl; + } } /** @@ -181,6 +195,13 @@ public List getFactories() { return factories; } + /** + * @return configPlaneUrl (Link to your hosted version of source-config) + */ + public String getConfigPlaneUrl() { + return configPlaneUrl; + } + void setEndPointUri(String endPointUri) { this.endPointUri = endPointUri; } @@ -217,6 +238,10 @@ void setRecordScreenViews(boolean recordScreenViews) { this.recordScreenViews = recordScreenViews; } + void setConfigPlaneUrl(String configPlaneUrl) { + this.configPlaneUrl = configPlaneUrl; + } + /** * @return custom toString implementation for RudderConfig */ @@ -374,7 +399,18 @@ public Builder withRecordScreenViews(boolean shouldRecordScreenViews) { */ public Builder withTrackLifecycleEvents(boolean shouldTrackLifecycleEvents) { this.trackLifecycleEvents = shouldTrackLifecycleEvents; - return this; + return this; + } + + private String configPlaneUrl = Constants.CONFIG_PLANE_URL; + + /** + * @param configPlaneUrl Your hosted version of sourceConfig + * @return RudderConfig.Builder + */ + public Builder withConfigPlaneUrl(String configPlaneUrl) { + this.configPlaneUrl = configPlaneUrl; + return this; } /** @@ -392,7 +428,9 @@ public RudderConfig build() { this.configRefreshInterval, this.trackLifecycleEvents, this.recordScreenViews, - this.factories); + this.configPlaneUrl, + this.factories + ); } } } diff --git a/core/src/main/java/com/rudderstack/android/sdk/core/RudderLogger.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderLogger.java index b927796b8..5c8fb8a22 100644 --- a/core/src/main/java/com/rudderstack/android/sdk/core/RudderLogger.java +++ b/core/src/main/java/com/rudderstack/android/sdk/core/RudderLogger.java @@ -15,17 +15,17 @@ static void init(int l) { logLevel = l; } - static void logError(Throwable throwable) { + public static void logError(Throwable throwable) { if (logLevel >= RudderLogLevel.ERROR) { Log.e(TAG, "Error: ", throwable); } } - static void logError(Exception ex) { + public static void logError(Exception ex) { logError(ex.getMessage()); } - static void logError(String message) { + public static void logError(String message) { if (logLevel >= RudderLogLevel.ERROR) { Log.e(TAG, "Error: " + message); } @@ -37,19 +37,19 @@ public static void logWarn(String message) { } } - static void logInfo(String message) { + public static void logInfo(String message) { if (logLevel >= RudderLogLevel.INFO) { Log.i(TAG, "Info: " + message); } } - static void logDebug(String message) { + public static void logDebug(String message) { if (logLevel >= RudderLogLevel.DEBUG) { Log.d(TAG, "Debug: " + message); } } - static void logVerbose(String message) { + public static void logVerbose(String message) { if (logLevel >= RudderLogLevel.VERBOSE) { Log.v(TAG, "Verbose: " + message); } diff --git a/core/src/main/java/com/rudderstack/android/sdk/core/RudderServerConfigManager.java b/core/src/main/java/com/rudderstack/android/sdk/core/RudderServerConfigManager.java index 6929e4fd4..53684c648 100644 --- a/core/src/main/java/com/rudderstack/android/sdk/core/RudderServerConfigManager.java +++ b/core/src/main/java/com/rudderstack/android/sdk/core/RudderServerConfigManager.java @@ -76,7 +76,7 @@ public void run() { int retryCount = 0, retryTimeOut = 10; while (!isDone && retryCount <= 3) { try { - String configUrl = Constants.CONFIG_PLANE_URL + "/sourceConfig"; + String configUrl = rudderConfig.getConfigPlaneUrl() + "sourceConfig"; RudderLogger.logDebug(String.format(Locale.US, "RudderServerConfigManager: downloadConfig: configUrl: %s", configUrl)); // create url object URL url = new URL(configUrl); diff --git a/sample-kotlin-integration/.gitignore b/sample-kotlin-integration/.gitignore new file mode 100644 index 000000000..796b96d1c --- /dev/null +++ b/sample-kotlin-integration/.gitignore @@ -0,0 +1 @@ +/build diff --git a/sample-kotlin-integration/build.gradle b/sample-kotlin-integration/build.gradle new file mode 100644 index 000000000..4f5e3716a --- /dev/null +++ b/sample-kotlin-integration/build.gradle @@ -0,0 +1,48 @@ +buildscript { + ext.kotlin_version = '1.3.41' + repositories { + google() + jcenter() + } + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61" + } +} + +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' + +android { + compileSdkVersion 29 + buildToolsVersion "29.0.2" + defaultConfig { + applicationId "com.rudderstack.integration.test.firebase" + minSdkVersion 16 + targetSdkVersion 29 + versionCode 4 + versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.core:core-ktx:1.2.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'com.google.android.material:material:1.1.0' + + implementation project(':core') + + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' +} diff --git a/sample-kotlin-integration/proguard-rules.pro b/sample-kotlin-integration/proguard-rules.pro new file mode 100644 index 000000000..f1b424510 --- /dev/null +++ b/sample-kotlin-integration/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/sample-kotlin-integration/src/main/AndroidManifest.xml b/sample-kotlin-integration/src/main/AndroidManifest.xml new file mode 100644 index 000000000..794ba2988 --- /dev/null +++ b/sample-kotlin-integration/src/main/AndroidManifest.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sample-kotlin-integration/src/main/java/com/rudderstack/android/sample/kotlin/FirstActivity.kt b/sample-kotlin-integration/src/main/java/com/rudderstack/android/sample/kotlin/FirstActivity.kt new file mode 100644 index 000000000..6e3358f8f --- /dev/null +++ b/sample-kotlin-integration/src/main/java/com/rudderstack/android/sample/kotlin/FirstActivity.kt @@ -0,0 +1,17 @@ +package com.rudderstack.android.sample.kotlin + +import android.content.Intent +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import kotlinx.android.synthetic.main.activity_first.* + +class FirstActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_first) + + navigate_to_second.setOnClickListener { + startActivity(Intent(this, SecondActivity::class.java)) + } + } +} \ No newline at end of file diff --git a/sample-kotlin-integration/src/main/java/com/rudderstack/android/sample/kotlin/MainActivity.kt b/sample-kotlin-integration/src/main/java/com/rudderstack/android/sample/kotlin/MainActivity.kt new file mode 100644 index 000000000..dc6877882 --- /dev/null +++ b/sample-kotlin-integration/src/main/java/com/rudderstack/android/sample/kotlin/MainActivity.kt @@ -0,0 +1,107 @@ +package com.rudderstack.android.sample.kotlin + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import com.rudderstack.android.sdk.core.RudderMessageBuilder +import com.rudderstack.android.sdk.core.ecomm.* + + +class MainActivity : AppCompatActivity() { + private var count = 0 + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + + val rudderClient = MainApplication.rudderClient + + val properties: MutableMap = mutableMapOf() + properties["test_key_1"] = "test_value_1" + + val childProperties: MutableMap = HashMap() + childProperties["test_child_key_1"] = "test_child_value_1" + properties["test_key_2"] = childProperties + properties["category"] = "test_category" + + rudderClient!!.track( + RudderMessageBuilder() + .setEventName("WebSite_test") + .setUserId("test_user_id") + .setProperty(properties) + .build() + ) + + // ECommerce Product + val productA = ECommerceProduct.Builder() + .withProductId("some_product_id_a") + .withSku("some_product_sku_a") + .withCategory("some_category") + .withName("Product Name A") + .withBrand("Product Brand A") + .withVariant("Product Variant A") + .withPrice(2.99f) + .withCurrency("USD") + .withQuantity(1f) + .withCoupon("some_coupon") + .withPosition(1) + .withUrl("https://product.com/productA") + .withImageUrl("https://product.com/productA.jpg") + .build() + + val productB = ECommerceProduct.Builder() + .withProductId("some_product_id_b") + .withSku("some_product_sku_b") + .withCurrency("USD") + .withPrice(3.99f) + .withName("Some Product Name B") + .withQuantity(1f) + .build() + + val productC = ECommerceProduct.Builder() + .withProductId("some_product_id_c") + .withSku("some_product_sku_c") + .withCurrency("USD") + .withPrice(4.99f) + .withName("Some Product Name C") + .withQuantity(1f) + .build() + + // ECommerce WishList + val wishList = ECommerceWishList.Builder() + .withWishListId("some_wish_list_id") + .withWishListName("Some Wish List Name") + .build() + + // ECommerce Cart + val cart = ECommerceCart.Builder() + .withCartId("some_cart_id") + .withProduct(productA) + .withProduct(productB) + .withProduct(productC) + .build() + + // ECommerce Order + val order = ECommerceOrder.Builder() + .withOrderId("some_order_id") + .withAffiliation("some_order_affiliation") + .withCoupon("some_coupon") + .withCurrency("USD") + .withDiscount(1.49f) + .withProducts(productA, productB, productC) + .withRevenue(10.99f) + .withShippingCost(2.49f) + .withTax(1.49f) + .withTotal(12.99f) + .withValue(10.49f) + .build() + + // ECommerce Checkout event + val checkout = ECommerceCheckout.Builder() + .withCheckoutId("some_checkout_id") + .withOrderId("some_order_id") + .withPaymentMethod("Visa") + .withShippingMethod("FedEx") + .withStep(1) + .build() + } +} diff --git a/sample-kotlin-integration/src/main/java/com/rudderstack/android/sample/kotlin/MainApplication.kt b/sample-kotlin-integration/src/main/java/com/rudderstack/android/sample/kotlin/MainApplication.kt new file mode 100644 index 000000000..65e47f910 --- /dev/null +++ b/sample-kotlin-integration/src/main/java/com/rudderstack/android/sample/kotlin/MainApplication.kt @@ -0,0 +1,82 @@ +package com.rudderstack.android.sample.kotlin + +import android.app.Activity +import android.app.Application +import android.os.Bundle +import android.util.Log +import com.rudderstack.android.integration.dummy.FirebaseIntegrationFactory +import com.rudderstack.android.sdk.core.RudderClient +import com.rudderstack.android.sdk.core.RudderConfig +import com.rudderstack.android.sdk.core.RudderLogger + +class MainApplication : Application() { + companion object { + var rudderClient: RudderClient? = null + const val TAG = "MainApplication" + const val END_URL = "https://cd740f82.ngrok.io" + const val WRITE_KEY = "1TSRSskqa15PG7F89tkwEbl5Td8" + } + + override fun onCreate() { + super.onCreate() + + rudderClient = RudderClient.getInstance( + this, + WRITE_KEY, + RudderConfig.Builder() + .withEndPointUri(END_URL) + .withLogLevel(RudderLogger.RudderLogLevel.VERBOSE) + .withConfigPlaneUrl(END_URL) + .withFactory(FirebaseIntegrationFactory.FACTORY) + .withTrackLifecycleEvents(true) + .withRecordScreenViews(true) + .build() + ) + + registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks { + override fun onActivityPaused(p0: Activity) { + Log.d(TAG, "onActivityPaused ${p0.localClassName}") + } + + override fun onActivityStarted(p0: Activity) { + Log.d(TAG, "onActivityStarted ${p0.localClassName}") + } + + override fun onActivityDestroyed(p0: Activity) { + Log.d(TAG, "onActivityDestroyed ${p0.localClassName}") + } + + override fun onActivitySaveInstanceState(p0: Activity, p1: Bundle) { + Log.d(TAG, "onActivitySaveInstanceState ${p0.localClassName}, Bundle: $p1") + } + + override fun onActivityStopped(p0: Activity) { + Log.d(TAG, "onActivityStopped ${p0.localClassName}") + } + + override fun onActivityCreated(p0: Activity, p1: Bundle?) { + Log.d(TAG, "onActivityCreated ${p0.localClassName} Bundle: ${p1.toString()}") + } + + override fun onActivityResumed(p0: Activity) { + Log.d(TAG, "onActivityResumed ${p0.localClassName}") + } + + }) + } + + override fun onLowMemory() { + super.onLowMemory() + Log.d(TAG, "onLowMemory") + } + + override fun onTerminate() { + super.onTerminate() + Log.d(TAG, "onTerminate") + } + + override fun onTrimMemory(level: Int) { + super.onTrimMemory(level) + Log.d(TAG, "onTrimMemory: $level") + } +} \ No newline at end of file diff --git a/sample-kotlin-integration/src/main/java/com/rudderstack/android/sample/kotlin/SecondActivity.kt b/sample-kotlin-integration/src/main/java/com/rudderstack/android/sample/kotlin/SecondActivity.kt new file mode 100644 index 000000000..fd29494cc --- /dev/null +++ b/sample-kotlin-integration/src/main/java/com/rudderstack/android/sample/kotlin/SecondActivity.kt @@ -0,0 +1,11 @@ +package com.rudderstack.android.sample.kotlin + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity + +class SecondActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_second) + } +} \ No newline at end of file diff --git a/sample-kotlin-integration/src/main/res/drawable-v24/ic_launcher_foreground.xml b/sample-kotlin-integration/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 000000000..6348baae3 --- /dev/null +++ b/sample-kotlin-integration/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/sample-kotlin-integration/src/main/res/drawable/ic_launcher_background.xml b/sample-kotlin-integration/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 000000000..a0ad202f9 --- /dev/null +++ b/sample-kotlin-integration/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sample-kotlin-integration/src/main/res/layout/activity_first.xml b/sample-kotlin-integration/src/main/res/layout/activity_first.xml new file mode 100644 index 000000000..13f8f1841 --- /dev/null +++ b/sample-kotlin-integration/src/main/res/layout/activity_first.xml @@ -0,0 +1,13 @@ + + + +