Skip to content

Commit

Permalink
Merge pull request #54 from adobe/staging
Browse files Browse the repository at this point in the history
(2.0.1 release) staging -> main
  • Loading branch information
emdobrin committed Feb 17, 2023
2 parents cf9f1b1 + e74756a commit 066c980
Show file tree
Hide file tree
Showing 32 changed files with 1,574 additions and 764 deletions.
24 changes: 8 additions & 16 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
<!--- STOP! Before you open an issue please search this repository's issues to see if it has already been reported. This helps reduce duplicate issues from being created. -->
<!--- SECURITY DISCLOSURE: If this is a security disclosure please follow the guidelines in CONTRIBUTING.md. This helps keep folks from accidentally releasing vulnerabilities before the maintainers get a chance to fix the issue. -->

### Expected Behaviour

### Actual Behaviour

### Reproduce Scenario (including but not limited to)

#### Steps to Reproduce

#### Platform and Version

#### Sample Code that illustrates the problem

#### Logs taken while reproducing problem
---
name: Blank issue
labels: task
---
## Prerequisites
<!--- Go through the items below before logging an issue -->
- [ ] I have searched in this repository's issues to see if it has already been reported.
- [ ] This is not a Security Disclosure, otherwise please follow the guidelines in [Security Policy](https://github.com/adobe/aepsdk-analytics-android/security/policy).
70 changes: 70 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: Bug report
description: Create a bug report to help us improve. Use this template if you encountered an issue while integrating with or implementing the APIs of this SDK.
labels: [bug, triage-required]

body:
- type: checkboxes
attributes:
label: Prerequisites
description: Please check the following items before logging a new bug report.
options:
- label: This is not a Security Disclosure, otherwise please follow the guidelines in [Security Policy](https://github.com/adobe/aepsdk-analytics-android/security/policy).
required: true
- label: I have searched in this repository's issues to see if it has already been reported.
required: true
- label: I have updated to the latest released version of the SDK and the issue still persists.
required: true

- type: textarea
attributes:
label: Bug summary
description: Please provide a summary of the bug you are reporting.
validations:
required: true

- type: textarea
attributes:
label: Environment
description: |
Please provide the OS version, SDK version(s) used, IDE version, and any other specific settings that could help us narrow down the problem.
Example:
- **OS**: Android 13
- **SDK(s)**: analytics 2.0.0, identity 2.0.0, core 2.0.0
- **IDE**: Android Studio 2021.3.1 Patch 1
validations:
required: true

- type: textarea
attributes:
label: Steps to reproduce
description: Steps to reproduce the behavior consistently.
placeholder: |
1. ...
2. ...
3. ...
validations:
required: false

- type: textarea
attributes:
label: Current behavior
description: A concise description of what you are experiencing.
validations:
required: false

- type: textarea
attributes:
label: Expected behavior
description: A concise description of what you expected to happen.
validations:
required: false

- type: textarea
attributes:
label: Anything else?
description: |
Here you can include sample code that illustrates the problem, logs taken while reproducing the problem, or anything that can give us more context about the issue you are encountering.
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false
43 changes: 43 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Feature request
description: Suggest an idea for this project.
labels: [feature-request, triage-required]

body:
- type: checkboxes
attributes:
label: Prerequisites
description: Please check the following items before logging a new feature request.
options:
- label: This is not a Security Disclosure, otherwise please follow the guidelines in [Security Policy](https://github.com/adobe/aepsdk-analytics-android/security/policy).
required: true
- label: I have searched in this repository's issues to see if it has already been reported.
required: true

- type: textarea
id: description
attributes:
label: Feature request summary
description: Please provide a summary of the feature.
validations:
required: true

- type: textarea
attributes:
label: Current behavior
description: A concise description of what you are experiencing.
validations:
required: false

- type: textarea
attributes:
label: Expected behavior
description: A concise description of what you expected to happen.
validations:
required: false

- type: textarea
attributes:
label: Additional implementation details or code snippets
description: Provide additional information about this request, implementation details or code snippets.
validations:
required: false
24 changes: 24 additions & 0 deletions .github/ISSUE_TEMPLATE/project_epic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Project epic
description: Create an internal epic that represents the top level parent of multiple tasks.
labels: [epic]

body:
- type: textarea
id: description
attributes:
label: Epic description
description: Please provide a detailed description for this epic.
validations:
required: true

- type: textarea
id: tasks
attributes:
label: Tasks
description: |
Provide a high-level definition of done for this epic as a list of tasks that need to be completed.
Tip: List out the task links if they already exist or list them out as text with a descriptive title so they can be easily converted to task items.
placeholder: |
- [ ] your task link here
validations:
required: false
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/project_task.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Project task
description: Create an internal task that can be completed as a standalone code change or is part of an epic.
labels: [task]
body:
- type: textarea
attributes:
label: Task description
description: Please provide a summary or the "what" of the task logged.
validations:
required: true

- type: textarea
attributes:
label: Additional implementation details or code snippet(s)
description: Provide additional information about this task, implementation details or code snippets.
validations:
required: false
2 changes: 1 addition & 1 deletion .github/workflows/maven-release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Publish package to the Maven Central Repository
name: Publish Release
on: workflow_dispatch

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-snapshot.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Publish package to the Maven Central Repository
name: Publish Snapshot
on:
push:
branches:
Expand Down
38 changes: 0 additions & 38 deletions Documentation/api-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ Analytics.clearQueue();
```
#### Kotlin

##### Syntax
```kotlin
fun clearQueue()
```

##### Example
```kotlin

Expand Down Expand Up @@ -71,10 +66,6 @@ String extensionVersion = Analytics.extensionVersion();

#### Kotlin

##### Syntax
```kotlin
fun extensionVersion(): String
```
##### Example
```kotlin
val extensionVersion = Analytics.extensionVersion();
Expand Down Expand Up @@ -102,11 +93,6 @@ MobileCore.registerExtensions(Arrays.asList(Analytics.EXTENSION, ...), new Adobe

#### Kotlin

##### Syntax
```kotlin
val EXTENSION: Class<out Extension?> = AnalyticsExtension::class.java
```

##### Example
```kotlin
MobileCore.registerExtensions(listOf(Analytics.EXTENSION, ...)){
Expand Down Expand Up @@ -144,11 +130,6 @@ Analytics.getQueueSize(new AdobeCallbackWithError<Long>() {

#### Kotlin

##### Syntax
```kotlin
fun getQueueSize(callback: AdobeCallback<Long?>)
```

##### Example
```kotlin
Analytics.getQueueSize(object: AdobeCallbackWithError<Long> {
Expand Down Expand Up @@ -195,11 +176,6 @@ Analytics.getTrackingIdentifier(new AdobeCallbackWithError<String>() {

#### Kotlin

##### Syntax
```kotlin
fun getTrackingIdentifier(callback: AdobeCallback<String?>)
```

##### Example

```kotlin
Expand Down Expand Up @@ -247,10 +223,6 @@ Analytics.getVisitorIdentifier(new AdobeCallbackWithError<String>() {

#### Kotlin

##### Syntax
```kotlin
fun getVisitorIdentifier(callback: AdobeCallback<String?>)
```
##### Example
```kotlin
Analytics.getVisitorIdentifier(object: AdobeCallbackWithError<String> {
Expand Down Expand Up @@ -284,11 +256,6 @@ Analytics.sendQueuedHits();

#### Kotlin

##### Syntax
```kotlin
fun sendQueuedHits()
```

##### Example
```kotlin
Analytics.sendQueuedHits()
Expand Down Expand Up @@ -319,11 +286,6 @@ Analytics.setVisitorIdentifier("vid_1");

#### Kotlin

##### Syntax
```kotlin
fun setVisitorIdentifier(visitorID: String?)
```

##### Example
```kotlin
Analytics.setVisitorIdentifier("vid_1")
Expand Down
6 changes: 6 additions & 0 deletions code/analytics/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
languageVersion = "1.4"
apiVersion = "1.4"
}

}
configurations.all {
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ internal object AnalyticsConstants {

const val EXTENSION_NAME = "com.adobe.module.analytics"
const val FRIENDLY_NAME = "Analytics"
const val EXTENSION_VERSION = "2.0.0"
const val EXTENSION_VERSION = "2.0.1"
const val DATASTORE_NAME = "AnalyticsDataStorage"
const val DATA_QUEUE_NAME = EXTENSION_NAME
const val REORDER_QUEUE_NAME = "com.adobe.module.analyticsreorderqueue"
Expand Down Expand Up @@ -165,6 +165,12 @@ internal object AnalyticsConstants {
const val VISITOR_ID_LOCATION_HINT = "locationhint"
const val VISITOR_IDS_LIST = "visitoridslist"
const val ADVERTISING_IDENTIFIER = "advertisingidentifier"

internal object VisitorID {
const val ID = "ID"
const val ID_TYPE = "ID_TYPE"
const val STATE = "STATE"
}
}

internal object Lifecycle {
Expand Down

0 comments on commit 066c980

Please sign in to comment.