Merge pull request #7 from adtrace/beta

Beta

.gitignore

@@ -13,6 +13,7 @@
 .externalNativeBuild
 .cxx
 local.properties
+gradle.properties
 /android-sdk/gradle.properties
 /android-sdk-plugin-oaid/gradle.properties
 /android-sdk-plugin-webbridge/gradle.properties

README.md

@@ -105,14 +105,14 @@ These are the minimum required steps to integrate the AdTrace SDK in your Androi
 If you are using Maven, add the following to your `build.gradle` file:
 
 ```java
-implementation 'io.adtrace:android-sdk:2.1.0'
+implementation 'io.adtrace:android-sdk:2.3.0'
 implementation 'com.android.installreferrer:installreferrer:2.2'
 ```
 
 If you would prefer to use the AdTrace SDK inside web views in your app, please include this additional dependency as well:
 
 ```java
-implementation 'io.adtrace:android-sdk-plugin-webbridge:2.1.1'
+implementation 'io.adtrace:android-sdk-plugin-webbridge:2.3.0'
 ```
 
 **Note**: The minimum supported Android API level for the web view extension is 17 (Jelly Bean).
@@ -149,15 +149,23 @@ If you are **not targeting the Google Play Store**, you must also add the follow
 
 #### <a id="gps-adid-permission"></a>Add permission to gather Google advertising ID
 
-If you are targeting Android 12 and above (API level 31), you need to add the `com.google.android.gms.AD_ID` permission to read the device's advertising ID. Add the following line to your `AndroidManifest.xml` to enable the permission.
-
+If you are targeting Android 12 and above (API level 31), you need to add the `com.google.android.gms.AD_ID` permission to read the device's advertising ID.
 ```xml
 <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
 ```
+ this permission is neccessary for attribution (tracking where an install is coming from) systems and it is a MUST for AdTrace SDK to work fine on android devices.
+from AdTrace Android SDK `V2.2 +` this feature is **built inside the SDK** and there is no need to manually addded it to your project. however in those cases where you do *not* want to use this permission you can simply add the following.
+
+```xml
+<uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
+```
+
+Add this to your `AndroidManifest.xml` to disable the permission.
 
 For more information, see [Google's `AdvertisingIdClient.Info` documentation](https://developers.google.com/android/reference/com/google/android/gms/ads/identifier/AdvertisingIdClient.Info#public-string-getid).
 
 
+
 ### <a id="qs-proguard"></a>Proguard settings
 
 If you are using Proguard, add these lines to your Proguard file:

android-sdk-plugin-oaid/.gitignore

@@ -1 +1,3 @@
-/build
+/build
+local.properties
+gradle.properties

android-sdk-plugin-oaid/build.gradle

@@ -1,35 +1,166 @@
-plugins {
-    id 'com.android.library'
-    id 'com.vanniktech.maven.publish'
-
-}
-
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
 
 android {
     compileSdkVersion rootProject.ext.coreCompileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.coreMinSdkVersion
         targetSdkVersion rootProject.ext.coreTargetSdkVersion
-        versionName rootProject.ext.coreVersionName
-        versionCode rootProject.ext.defaultVersionCode
-    }
-    lintOptions {
-        abortOnError false
     }
+
+
 }
 
 dependencies {
     compileOnly files('libs/oaid_sdk_1.1.0.aar')
+    // Add SDK via module.
     compileOnly project(':android-sdk')
+    // Add SDK via Maven.
+    // implementation 'io.adtrace:android-sdk:2.3.0'
+}
+
+// read local properties
+File localPropsFile = project.rootProject.file('local.properties')
+if (localPropsFile.exists()) {
+    Properties p = new Properties()
+    new FileInputStream(localPropsFile).withCloseable { is ->
+        p.load(is)
+    }
+    p.each { name, value ->
+        ext[name] = value
+    }
+}
+
+task adtraceOaidAndroidAar (type: Copy) {
+    dependsOn 'assembleRelease'
+
+    from('build/outputs/aar/')
+    include 'sdk-plugin-oaid-release.aar'
+    destinationDir file('build/libs/')
+    rename 'sdk-plugin-oaid-release.aar', "${project.name}.aar"
+
+}
+
+task adtraceOaidAndroidJar(type: Jar) {
+    dependsOn 'packageReleaseAssets'
+    dependsOn 'compileReleaseJavaWithJavac'
+
+    from('build/intermediates/library_assets/release/packageReleaseAssets/out/') {
+        into('assets')
+    }
+    from('build/intermediates/javac/release/classes/')
+
+    archiveName "${project.name}.jar"
+}
+
+task androidJavadocs(type: Javadoc) {
+    source = android.sourceSets.main.java.srcDirs
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    android.libraryVariants.all { variant ->
+        if (variant.name == 'release') {
+            classpath += variant.javaCompileProvider.get().classpath
+        }
+    }
+}
+
+task adtraceOaidAndroidJavadocsJar(type: Jar) {
+    dependsOn 'androidJavadocs'
+    classifier = 'javadoc'
+    from androidJavadocs.destinationDir
+}
+
+task adtraceOaidAndroidSourcesJar(type: Jar) {
+    classifier = 'sources'
+    from android.sourceSets.main.java.srcDirs
+}
+
+artifacts {
+    archives adtraceOaidAndroidJar
+    archives adtraceOaidAndroidJavadocsJar
+    archives adtraceOaidAndroidSourcesJar
 }
 
 publishing {
+    publications {
+        mavenAndroidOaid(MavenPublication) {
+            customizePom(pom)
+            groupId rootProject.ext.adtraceGroupId
+            artifactId 'android-sdk-plugin-oaid'
+            version rootProject.ext.coreVersionName
+
+            artifact adtraceOaidAndroidJar
+            artifact adtraceOaidAndroidJavadocsJar
+            artifact adtraceOaidAndroidSourcesJar
+        }
+    }
+
     repositories {
         maven {
-            def releasesRepoUrl = "$buildDir/repos/releases"
-            def snapshotsRepoUrl = "$buildDir/repos/snapshots"
-            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+            url "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
+            if (project.hasProperty("sonatypeUsername")) {
+                credentials {
+                    username sonatypeUsername
+                    password sonatypePassword
+                }
+            }
+        }
+    }
+}
+
+def customizePom(pom) {
+    pom.withXml {
+        def root = asNode()
+
+        // Add all items necessary for maven central publication.
+        root.children().last() + {
+            resolveStrategy = Closure.DELEGATE_FIRST
+            description 'The AdTrace SDK for Android'
+            name 'AdTrace Android SDK'
+            url 'https://github.com/adtrace/adtrace_sdk_android'
+            organization {
+                name 'adtrace'
+                url 'https://www.adtrace.io'
+            }
+            licenses {
+                license {
+                    name 'MIT License'
+                    url 'http://www.opensource.org/licenses/mit-license.php'
+                }
+            }
+            scm {
+                url '[email protected]:adtrace/adtrace_sdk_android.git'
+                connection 'scm:git:[email protected]:adtrace/adtrace_sdk_android.git'
+                developerConnection 'scm:git:[email protected]:adtrace/adtrace_sdk_android.git'
+            }
+            developers {
+                developer {
+                    name 'Nasser Amini'
+                    email '[email protected]'
+                }
+            }
         }
     }
-}
+}
+
+model {
+    tasks.generatePomFileForMavenAndroidOaidPublication {
+        destination = file("${project.buildDir}/generated-pom.xml")
+    }
+    /* TODO check if/how to replace this tasks
+    tasks.publishMavenAndroidOaidPublicationToMavenLocal {
+        dependsOn project.tasks.signArchives
+    }
+    tasks.publishMavenAndroidOaidPublicationToMavenRepository {
+        dependsOn project.tasks.signArchives
+    }
+    */
+}
+
+
+
+signing {
+    sign configurations.archives
+    sign publishing.publications.mavenAndroidOaid
+}

android-sdk-plugin-oaid/proguard-rules.pro

@@ -19,4 +19,5 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
--keep class com.bun.miitmdid.core.** {*;}
+-keep class com.bun.miitmdid.** {*;}
+-keep interface com.bun.supplier.** {*;}

android-sdk-plugin-oaid/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.adtrace.sdk.oaid"/>
-
+    package="io.adtrace.sdk.oaid">
+</manifest>

android-sdk-plugin-oaid/src/main/java/io/adtrace/sdk/oaid/AdTraceOaid.java

@@ -17,7 +17,7 @@ public static void readOaid(Context context) {
         readOaid();
 
         try {
-            System.loadLibrary("nllvm1623827671");
+            System.loadLibrary("msaoaidsec");
             String certificate = Util.readCertFromAssetFile(context);
             isMsaSdkAvailable = MdidSdkHelper.InitCert(context, certificate);
         } catch (Throwable t) {

android-sdk-plugin-oaid/src/main/java/io/adtrace/sdk/oaid/MsaSdkClient.java

@@ -2,7 +2,7 @@
 
 import android.content.Context;
 
-
+import io.adtrace.sdk.ILogger;
 import com.bun.miitmdid.core.InfoCode;
 import com.bun.miitmdid.core.MdidSdkHelper;
 import com.bun.miitmdid.interfaces.IIdentifierListener;
@@ -12,8 +12,6 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import io.adtrace.sdk.ILogger;
-
 public class MsaSdkClient {
     public static String getOaid(Context context, final ILogger logger, long maxWaitTimeInMilli) {
         final BlockingQueue<String> oaidHolder = new LinkedBlockingQueue<String>(1);
@@ -72,4 +70,4 @@ private static boolean isError(int result, ILogger logger) {
                 return false;
         }
     }
-}
+}

android-sdk-plugin-oaid/src/main/java/io/adtrace/sdk/oaid/OpenDeviceIdentifierConnector.java

@@ -124,4 +124,5 @@ private void set(IBinder service) {
             logger.debug("Fail to add in queue %s", e.getMessage());
         }
     }
-}
+}
+

android-sdk-plugin-oaid/src/main/java/io/adtrace/sdk/oaid/OpenDeviceIdentifierService.java

@@ -3,7 +3,6 @@
  */
 package io.adtrace.sdk.oaid;
 
-
 /**
  * Important: Please do not revise the order of the method in this AIDL file
  */
@@ -133,4 +132,4 @@ public boolean isOaidTrackLimited() throws android.os.RemoteException {
      * Obtain limit ad tracking parameter, true: limit tracking; false: do not limit tracking
      */
     public boolean isOaidTrackLimited() throws android.os.RemoteException;
-}
+}

android-sdk-plugin-oaid/src/main/java/io/adtrace/sdk/oaid/Util.java

@@ -1,6 +1,5 @@
 package io.adtrace.sdk.oaid;
 
-
 import android.content.Context;
 import android.util.Log;
 
@@ -110,4 +109,4 @@ public static String readCertFromAssetFile(Context context) {
             return "";
         }
     }
-}
+}

android-sdk-plugin-webbridge/.gitignore

@@ -1 +1,3 @@
-/build
+/build
+local.properties
+gradle.properties