Merge branch 'master-v2' into develop-v2

# Conflicts: # .github/workflows/build-v2.yml # build.gradle # dependencies.gradle # gsonrudderadapter/src/main/java/com/rudderstack/gsonrudderadapter/GsonAdapter.kt # moshirudderadapter/src/main/java/com/rudderstack/moshirudderadapter/MoshiAdapter.kt # package.json # repository/build.gradle # repository/src/main/java/com/rudderstack/android/repository/Dao.kt # repository/src/main/java/com/rudderstack/android/repository/RudderDatabase.kt # repository/src/test/java/com/rudderstack/android/repository/RudderDatabaseTest.kt # rudderreporter/build.gradle # rudderreporter/project.json # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/Configuration.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/DefaultRudderReporter.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/Metrics.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/Reservoir.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/RudderReporter.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/Syncer.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/error/Breadcrumb.java # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/error/ErrorEvent.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/error/ErrorModel.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/error/Metadata.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/internal/BackgroundTaskService.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/internal/DataCollectionModule.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/internal/DefaultEntityFactory.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/internal/DefaultMetrics.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/internal/DefaultReservoir.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/internal/DefaultSyncer.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/internal/DefaultUploadMediator.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/internal/Device.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/internal/DeviceWithState.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/internal/error/BreadcrumbState.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/internal/error/Error.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/internal/error/ExceptionHandler.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/internal/error/RudderErrorStateModule.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/internal/error/Stackframe.kt # rudderreporter/src/main/java/com/rudderstack/android/ruddermetricsreporterandroid/internal/error/Stacktrace.kt # rudderreporter/src/test/java/com/rudderstack/android/ruddermetricsreporterandroid/internal/DefaultReservoirTest.kt # rudderreporter/src/test/java/com/rudderstack/android/ruddermetricsreporterandroid/internal/DefaultSyncerTest.kt # rudderreporter/src/test/java/com/rudderstack/android/ruddermetricsreporterandroid/internal/DefaultUploaderTest.kt # web/src/main/java/com/rudderstack/web/internal/WebServiceImpl.kt # web/src/test/java/com/rudderstack/web/WebApiTest.kt
rudderlabs · Sep 19, 2023 · 9e5ee63 · 9e5ee63
2 parents abc5a41 + a52e9f7
commit 9e5ee63
Show file tree

Hide file tree

Showing 7 changed files with 589 additions and 6 deletions.
diff --git a/gsonrudderadapter/project.json b/gsonrudderadapter/project.json
@@ -46,7 +46,7 @@
     "github": {
       "executor": "@jscutlery/semver:github",
       "options": {
-        "tag": "gsonrudderadapter@1.0.0",
+        "tag": "gsonrudderadapter@0.1.0",
         "notesFile": "./gsonrudderadapter/CHANGELOG_LATEST.md"
       }
     },

diff --git a/jacksonrudderadapter/project.json b/jacksonrudderadapter/project.json
@@ -47,7 +47,7 @@
     "github": {
       "executor": "@jscutlery/semver:github",
       "options": {
-        "tag": "jacksonrudderadapter@1.0.0",
+        "tag": "jacksonrudderadapter@0.1.0",
         "notesFile": "./jacksonrudderadapter/CHANGELOG_LATEST.md"
       }
     },

diff --git a/moshirudderadapter/project.json b/moshirudderadapter/project.json
@@ -45,7 +45,7 @@
     "github": {
       "executor": "@jscutlery/semver:github",
       "options": {
-        "tag": "moshirudderadapter@1.0.0",
+        "tag": "moshirudderadapter@0.1.0",
         "notesFile": "./moshirudderadapter/CHANGELOG_LATEST.md"
       }
     },

diff --git a/repository/project.json b/repository/project.json
@@ -39,7 +39,7 @@
     "github": {
       "executor": "@jscutlery/semver:github",
       "options": {
-        "tag": "repository@1.0.0",
+        "tag": "repository@0.1.0",
         "notesFile": "./repository/CHANGELOG_LATEST.md"
       }
     },

diff --git a/rudderjsonadapter/project.json b/rudderjsonadapter/project.json
@@ -39,7 +39,7 @@
     "github": {
       "executor": "@jscutlery/semver:github",
       "options": {
-        "tag": "rudderjsonadapter@1.0.0",
+        "tag": "rudderjsonadapter@0.1.0",
         "notesFile": "./rudderjsonadapter/CHANGELOG_LATEST.md"
       }
     },