Skip to content

Commit

Permalink
Version Bump + ChangeLog
Browse files Browse the repository at this point in the history 
Summary: As we are beginning the release process, we can now prepare the version bump + change log for the release. Also, we can update the release date used in the client side dedup case.

Reviewed By: ryantobinmeta

Differential Revision: D68025071

fbshipit-source-id: 290834e7f6c65fa07d6fe381c6ea5e48e692004c
  • Loading branch information
@maxalbrightmeta @facebook-github-bot
maxalbrightmeta authored and facebook-github-bot committed Jan 10, 2025
1 parent d3f37ef commit 5123e19
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 26 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [18.0.0]

### Added
- Add support for in-app purchase auto-logging for Google Play Billing Libraries 5 through 7

## [17.0.2]

### Added
Expand Down
2 changes: 1 addition & 1 deletion facebook-core/src/main/java/com/facebook/FacebookSdkVersion.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
package com.facebook

internal object FacebookSdkVersion {
const val BUILD = "17.0.2"
const val BUILD = "18.0.0"
}
4 changes: 2 additions & 2 deletions facebook-core/src/main/java/com/facebook/appevents/iap/InAppPurchaseLoggerManager.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import kotlin.math.min
@AutoHandleExceptions
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
object InAppPurchaseLoggerManager {
// October 31, 2024 07:00:00 GMT
private const val APPROXIMATE_IAP_ENHANCEMENT_RELEASE_TIME = 1730358000000L
// January 10, 2025 05:00:00 PM GMT
private const val APPROXIMATE_IAP_ENHANCEMENT_RELEASE_TIME = 1736528400000L
private const val MILLISECONDS_IN_SECONDS = 1000.0
private const val PURCHASE_TIME = "purchaseTime"
private const val IAP_SKU_CACHE_GPBLV1 = "com.facebook.internal.SKU_DETAILS"
Expand Down
46 changes: 23 additions & 23 deletions facebook-core/src/test/kotlin/com/facebook/appevents/iap/InAppPurchaseLoggerManagerTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ class InAppPurchaseLoggerManagerTest : FacebookPowerMockTestCase() {
Assertions.assertThat(cachedMap).isEmpty()

Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_PURCHASE_KEY])
.isEqualTo(1730358000000L)
.isEqualTo(1736528400000L)
Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_SUBSCRIPTION_KEY])
.isEqualTo(1730358000000L)
.isEqualTo(1736528400000L)

}

Expand All @@ -143,7 +143,7 @@ class InAppPurchaseLoggerManagerTest : FacebookPowerMockTestCase() {
val mockPurchaseDetailsMap: MutableMap<String, JSONObject> = mutableMapOf()
val purchaseDetailJson1 =
JSONObject(
"{\"productId\":\"espresso\",\"purchaseToken\":\"token123\",\"purchaseTime\":1730358000001,\"developerPayload\":null,\"packageName\":\"sample.packagename\"}"
"{\"productId\":\"espresso\",\"purchaseToken\":\"token123\",\"purchaseTime\":1736528400001,\"developerPayload\":null,\"packageName\":\"sample.packagename\"}"
)
mockPurchaseDetailsMap["espresso"] = purchaseDetailJson1

Expand All @@ -164,9 +164,9 @@ class InAppPurchaseLoggerManagerTest : FacebookPowerMockTestCase() {
Assertions.assertThat(cachedMap).isNotEmpty()

Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_PURCHASE_KEY])
.isEqualTo(1730358000001)
.isEqualTo(1736528400001)
Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_SUBSCRIPTION_KEY])
.isEqualTo(1730358000000)
.isEqualTo(1736528400000)
}

@Test
Expand All @@ -176,7 +176,7 @@ class InAppPurchaseLoggerManagerTest : FacebookPowerMockTestCase() {
val mockPurchaseDetailsMap: MutableMap<String, JSONObject> = mutableMapOf()
val purchaseDetailJson1 =
JSONObject(
"{\"productId\":\"espresso\",\"purchaseToken\":\"token123\",\"purchaseTime\":1730358000001,\"developerPayload\":null,\"packageName\":\"sample.packagename\"}"
"{\"productId\":\"espresso\",\"purchaseToken\":\"token123\",\"purchaseTime\":1736528400001,\"developerPayload\":null,\"packageName\":\"sample.packagename\"}"
)
mockPurchaseDetailsMap["espresso"] = purchaseDetailJson1

Expand All @@ -197,9 +197,9 @@ class InAppPurchaseLoggerManagerTest : FacebookPowerMockTestCase() {
Assertions.assertThat(cachedMap).isNotEmpty()

Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_PURCHASE_KEY])
.isEqualTo(1730358000001)
.isEqualTo(1736528400001)
Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_SUBSCRIPTION_KEY])
.isEqualTo(1730358000000)
.isEqualTo(1736528400000)
}

@Test
Expand All @@ -224,9 +224,9 @@ class InAppPurchaseLoggerManagerTest : FacebookPowerMockTestCase() {
Assertions.assertThat(cachedMap).isEmpty()

Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_PURCHASE_KEY])
.isEqualTo(1730358000000)
.isEqualTo(1736528400000)
Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_SUBSCRIPTION_KEY])
.isEqualTo(1730358000000)
.isEqualTo(1736528400000)
}

@Test
Expand Down Expand Up @@ -254,7 +254,7 @@ class InAppPurchaseLoggerManagerTest : FacebookPowerMockTestCase() {
Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_PURCHASE_KEY])
.isEqualTo(1630000000000000)
Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_SUBSCRIPTION_KEY])
.isEqualTo(1730358000000)
.isEqualTo(1736528400000)
}

@Test
Expand Down Expand Up @@ -287,9 +287,9 @@ class InAppPurchaseLoggerManagerTest : FacebookPowerMockTestCase() {
Assertions.assertThat(cachedMap).isEmpty()

Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_PURCHASE_KEY])
.isEqualTo(1730358000000)
.isEqualTo(1736528400000)
Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_SUBSCRIPTION_KEY])
.isEqualTo(1730358000000)
.isEqualTo(1736528400000)
}

@Test
Expand All @@ -300,7 +300,7 @@ class InAppPurchaseLoggerManagerTest : FacebookPowerMockTestCase() {
val mockPurchaseDetailsMap: MutableMap<String, JSONObject> = mutableMapOf()
val purchaseDetailJson1 =
JSONObject(
"{\"productId\":\"espresso\",\"purchaseToken\":\"token123\",\"purchaseTime\":1730358000001,\"developerPayload\":null,\"packageName\":\"sample.packagename\"}"
"{\"productId\":\"espresso\",\"purchaseToken\":\"token123\",\"purchaseTime\":1736528400001,\"developerPayload\":null,\"packageName\":\"sample.packagename\"}"
)
mockPurchaseDetailsMap["espresso"] = purchaseDetailJson1

Expand All @@ -320,9 +320,9 @@ class InAppPurchaseLoggerManagerTest : FacebookPowerMockTestCase() {
Assertions.assertThat(cachedMap).isNotEmpty()

Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_PURCHASE_KEY])
.isEqualTo(1730358000000)
.isEqualTo(1736528400000)
Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_SUBSCRIPTION_KEY])
.isEqualTo(1730358000001)
.isEqualTo(1736528400001)
}

@Test
Expand All @@ -333,7 +333,7 @@ class InAppPurchaseLoggerManagerTest : FacebookPowerMockTestCase() {
val mockPurchaseDetailsMap: MutableMap<String, JSONObject> = mutableMapOf()
val purchaseDetailJson1 =
JSONObject(
"{\"productId\":\"espresso\",\"purchaseToken\":\"token123\",\"purchaseTime\":1730358000001,\"developerPayload\":null,\"packageName\":\"sample.packagename\"}"
"{\"productId\":\"espresso\",\"purchaseToken\":\"token123\",\"purchaseTime\":1736528400001,\"developerPayload\":null,\"packageName\":\"sample.packagename\"}"
)
mockPurchaseDetailsMap["espresso"] = purchaseDetailJson1

Expand Down Expand Up @@ -399,7 +399,7 @@ class InAppPurchaseLoggerManagerTest : FacebookPowerMockTestCase() {
val mockPurchaseDetailsMap: MutableMap<String, JSONObject> = mutableMapOf()
val purchaseDetailJson1 =
JSONObject(
"{\"productId\":\"espresso\",\"purchaseToken\":\"token123\",\"purchaseTime\":1730358000001,\"developerPayload\":null,\"packageName\":\"sample.packagename\"}"
"{\"productId\":\"espresso\",\"purchaseToken\":\"token123\",\"purchaseTime\":1736528400001,\"developerPayload\":null,\"packageName\":\"sample.packagename\"}"
)
mockPurchaseDetailsMap["espresso"] = purchaseDetailJson1

Expand All @@ -419,9 +419,9 @@ class InAppPurchaseLoggerManagerTest : FacebookPowerMockTestCase() {
Assertions.assertThat(cachedMap).isNotEmpty()

Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_PURCHASE_KEY])
.isEqualTo(1730358000000)
.isEqualTo(1736528400000)
Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_SUBSCRIPTION_KEY])
.isEqualTo(1730358000001)
.isEqualTo(1736528400001)

}

Expand All @@ -447,9 +447,9 @@ class InAppPurchaseLoggerManagerTest : FacebookPowerMockTestCase() {
Assertions.assertThat(cachedMap).isEmpty()

Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_PURCHASE_KEY])
.isEqualTo(1730358000000)
.isEqualTo(1736528400000)
Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_SUBSCRIPTION_KEY])
.isEqualTo(1730358000000)
.isEqualTo(1736528400000)
}

@Test
Expand Down Expand Up @@ -477,7 +477,7 @@ class InAppPurchaseLoggerManagerTest : FacebookPowerMockTestCase() {
Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_SUBSCRIPTION_KEY])
.isEqualTo(1620000000000001)
Assertions.assertThat(mockNewCachedMap[TIME_OF_LAST_LOGGED_PURCHASE_KEY])
.isEqualTo(1730358000000)
.isEqualTo(1736528400000)
}


Expand Down

0 comments on commit 5123e19

Please sign in to comment.