Merge pull request #20 from AppsFlyerSDK/releases/2.x.x/2.1.x/2.1.0-rc1

v2.1.0

AppsFlyerunitypurchaseconnector/AppsFlyerUnityPurchaseConnector/build.gradle

@@ -2,6 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 32
+    namespace "com.appsflyer.appsflyerunitypurchaseconnector"
 
     defaultConfig {
         minSdkVersion 19
@@ -21,7 +22,7 @@ android {
 
 dependencies {
     implementation 'androidx.annotation:annotation:1.4.0'
-    compileOnly 'com.appsflyer:purchase-connector:2.0.1'
+    compileOnly 'com.appsflyer:purchase-connector:2.1.0'
     compileOnly 'com.android.billingclient:billing:5.2.0'
     testImplementation 'junit:junit:4.12'
     compileOnly fileTree(dir: 'libs', include: ['*.jar'])

AppsFlyerunitypurchaseconnector/AppsFlyerUnityPurchaseConnector/publish.gradle

@@ -15,17 +15,6 @@ def getSnapshotRepositoryUrl() {
             : "https://oss.sonatype.org/content/repositories/snapshots/"
 }
 
-task androidJavadocs(type: Javadoc) {
-    exclude "**/*.orig" // exclude files created by source control
-    source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    failOnError false
-}
-
-task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-    archiveClassifier.set("javadoc")
-    from androidJavadocs.destinationDir
-}
 
 task androidSourcesJar(type: Jar) {
     archiveClassifier.set("sources")
@@ -65,6 +54,15 @@ def configurePom(pom) {
     }
 }
 
+android {
+    publishing {
+        singleVariant("release") {
+            // if you don't want sources/javadoc, remove these lines
+            withJavadocJar()
+        }
+    }
+}
+
 afterEvaluate {
     publishing {
         publications {
@@ -79,7 +77,7 @@ afterEvaluate {
                 // Two artifacts, the `aar` and the sources
                 // artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
                 artifact bundleReleaseAar
-                artifact androidJavadocsJar
+                //artifact androidJavadocsJar
 
                 // Self-explanatory metadata for the most part
                 pom {

AppsFlyerunitypurchaseconnector/AppsFlyerUnityPurchaseConnector/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.appsflyer.unity.afunitypurchaseconnector">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>

AppsFlyerunitypurchaseconnector/app/build.gradle

@@ -4,7 +4,7 @@ plugins {
 
 android {
     compileSdkVersion 32
-
+    namespace "com.appsflyer.appsflyerunitypurchaseconnector"
     defaultConfig {
         applicationId "com.appsflyer.appsflyerunitypurchaseconnector"
         minSdkVersion 19

AppsFlyerunitypurchaseconnector/app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.example.appsflyerunitypurchaseconnector">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"

AppsFlyerunitypurchaseconnector/build.gradle

@@ -1,12 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
 
+    ext {
+        agp_version = '3.6.1'
+        agp_version1 = '8.1.1'
+    }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath "com.android.tools.build:gradle:$agp_version1"
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.30.0"
 
 

AppsFlyerunitypurchaseconnector/gradle.properties

@@ -7,6 +7,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+org.gradle.java.home=/usr/local/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
@@ -22,8 +23,8 @@ android.enableJetifier=true
 
 GROUP=com.appsflyer
 
-VERSION_CODE=6
-VERSION_NAME=2.0.1
+VERSION_CODE=7
+VERSION_NAME=2.1.0
 
 POM_ARTIFACT_ID=af-purchaseconnector-unity
 POM_PACKAGING=aar

AppsFlyerunitypurchaseconnector/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Sep 25 11:07:14 IDT 2022
+#Sun Dec 08 12:23:45 IST 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

Assets/AppsFlyer/AppsFlyerPurchaseConnector.cs

@@ -8,7 +8,7 @@ namespace AppsFlyerConnector
 
     public class AppsFlyerPurchaseConnector : MonoBehaviour {
 
-        public static readonly string kAppsFlyerPurchaseConnectorVersion = "2.0.4";
+        public static readonly string kAppsFlyerPurchaseConnectorVersion = "2.1.0";
 
 #if UNITY_ANDROID && !UNITY_EDITOR
         private static AndroidJavaClass appsFlyerAndroidConnector = new AndroidJavaClass("com.appsflyer.unity.afunitypurchaseconnector.AppsFlyerAndroidWrapper");

Assets/AppsFlyer/Editor/AppsFlyerPurchaseConnectorDependencies.xml

@@ -2,8 +2,8 @@
 <dependencies>
 
   <androidPackages>
-    <androidPackage spec="com.appsflyer:af-purchaseconnector-unity:2.0.1"></androidPackage>
-    <androidPackage spec="com.appsflyer:purchase-connector:2.0.1"></androidPackage>
+    <androidPackage spec="com.appsflyer:af-purchaseconnector-unity:2.1.0"></androidPackage>
+    <androidPackage spec="com.appsflyer:purchase-connector:2.1.0"></androidPackage>
   </androidPackages>
 
   <iosPods>

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Versions
+## v2.1.0
+* Update Android PurchaseConnector to 2.1.0
+
 ## v2.0.4
 * Fix 'missing AFUnityUtils.mm' when install UnitySDK by Unity Package Manager
 

UserSettings/Search.settings

@@ -0,0 +1 @@
+{}

deploy/build_appsflyer_unity_purchase-connector_plugin.sh

@@ -4,15 +4,15 @@ echo "Start build for appsflyer-unity-purchase-connector.unitypackage"
 
 DEPLOY_PATH=output
 UNITY_PATH="/Applications/Unity/Unity.app/Contents/MacOS/Unity"
-PACKAGE_NAME="appsflyer-unity-purchase-connector-2.0.4.unitypackage"
+PACKAGE_NAME="appsflyer-unity-purchase-connector-2.1.0.unitypackage"
 mkdir -p $DEPLOY_PATH
 
 #move external dependency manager
 echo "moving the external dependency manager to root"
 mv external-dependency-manager-1.2.144.unitypackage ..
 
 # Build the .unitypackage
- /Applications/Unity/Hub/Editor/2020.3.41f1/Unity.app/Contents/MacOS/Unity \
+ /Applications/Unity/Hub/Editor/2022.3.15f1/Unity.app/Contents/MacOS/Unity \
 -gvh_disable \
 -batchmode \
 -importPackage external-dependency-manager-1.2.144.unitypackage \
@@ -23,7 +23,7 @@ mv external-dependency-manager-1.2.144.unitypackage ..
 Assets \
 $PWD/$DEPLOY_PATH/$PACKAGE_NAME \
 -quit \
-&& echo "Package exported successfully to output/appsflyer-unity-purchase-connector-2.0.4.unitypackage" \
+&& echo "Package exported successfully to output/appsflyer-unity-purchase-connector-2.1.0.unitypackage" \
 || echo "Failed to export package. See create_unity_core.log for more info"
 
 if [ "$1" == "-p" ]; then

deploy/build_appsflyer_unity_purchase-connector_plugin_strict_mode.sh

@@ -4,7 +4,7 @@ echo "Start build for appsflyer-unity-purchase-connector.unitypackage - Strict M
 
 DEPLOY_PATH=output
 UNITY_PATH="/Applications/Unity/Unity.app/Contents/MacOS/Unity"
-PACKAGE_NAME="appsflyer-unity-purchase-connector-strict-mode-2.0.4.unitypackage"
+PACKAGE_NAME="appsflyer-unity-purchase-connector-strict-mode-2.1.0.unitypackage"
 mkdir -p $DEPLOY_PATH
 
 #move external dependency manager
@@ -16,7 +16,7 @@ sed -i '' 's/PurchaseConnector/PurchaseConnector\/Strict/g' ../Assets/AppsFlyer/
 echo "Changing PurchaseConnector to Strict Mode. Done."
 
 # Build the .unitypackage
- /Applications/Unity/Hub/Editor/2020.3.41f1/Unity.app/Contents/MacOS/Unity \
+ /Applications/Unity/Hub/Editor/2022.3.15f1/Unity.app/Contents/MacOS/Unity \
 -gvh_disable \
 -batchmode \
 -importPackage external-dependency-manager-1.2.144.unitypackage \
@@ -27,7 +27,7 @@ echo "Changing PurchaseConnector to Strict Mode. Done."
 Assets \
 $PWD/$DEPLOY_PATH/$PACKAGE_NAME \
 -quit \
-&& echo "Package exported successfully to output/appsflyer-unity-purchase-connector-strict-mode-2.0.4.unitypackage" \
+&& echo "Package exported successfully to output/appsflyer-unity-purchase-connector-strict-mode-2.1.0.unitypackage" \
 || echo "Failed to export package. See create_unity_core.log for more info"
 
 if [ "$1" == "-p" ]; then