Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions DemoApp/DemoAppJava/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

android {
compileSdk 34
compileSdk 35
namespace "co.optable.demoappjava"

defaultConfig {
Expand All @@ -16,8 +16,6 @@ android {
versionName "1.0.0"
archivesBaseName = "optable-android-sdk-demo-java"

multiDexEnabled true

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand All @@ -41,7 +39,7 @@ android {
dependencies {
// Optable SDK
if (useReleaseSdk == "true") {
implementation "com.github.Optable:optable-android-sdk:1.0.0"
implementation "com.github.Optable:optable-android-sdk:v1.2.0"
} else {
implementation "co.optable:local-sdk"
}
Expand All @@ -54,13 +52,12 @@ dependencies {

// Base Android
implementation "org.jetbrains.kotlin:kotlin-stdlib:2.0.21"
implementation 'com.android.support:multidex:1.0.3'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.navigation:navigation-fragment:2.1.0'
implementation 'androidx.navigation:navigation-ui:2.1.0'
implementation 'androidx.navigation:navigation-fragment:2.8.9'
implementation 'androidx.navigation:navigation-ui:2.8.9'
implementation 'androidx.preference:preference:1.2.1'

// Testing
testImplementation 'junit:junit:4.13.1'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import co.optable.sdk.OptableTargeting;
import com.google.android.gms.ads.admanager.AdManagerAdRequest;
import com.google.android.gms.ads.admanager.AdManagerAdView;
import com.google.common.collect.Lists;
import kotlin.Unit;

import java.util.*;
Expand Down Expand Up @@ -51,7 +50,7 @@ private void initUi(View root) {
private void onClickLoadAd() {
statusTextView.setText("");

ArrayList<OptableIdentifier.Email> ids = Lists.newArrayList(
List<OptableIdentifier> ids = Arrays.asList(
new OptableIdentifier.Email("test@test.com")
);
optable.targeting(ids, result -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.util.Base64;
import android.view.LayoutInflater;
import android.view.View;
Expand All @@ -11,16 +10,17 @@
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceManager;
import co.optable.demoappjava.R;
import co.optable.demoappjava.TheApplication;
import co.optable.sdk.OptableIdentifier;
import co.optable.sdk.OptableResult;
import co.optable.sdk.OptableSDK;
import com.google.common.collect.Lists;
import kotlin.Unit;

import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

public class IdentifyFragment extends Fragment {

Expand All @@ -47,7 +47,7 @@ private void initUi(View root) {
private void onClickIdentify() {
statusTextView.setText("");

ArrayList<OptableIdentifier.Email> ids = Lists.newArrayList(
List<OptableIdentifier> ids = Arrays.asList(
new OptableIdentifier.Email(emailText.getText().toString())
);
optable.identify(ids, result -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import com.google.android.gms.ads.LoadAdError;
import com.google.android.gms.ads.admanager.AdManagerAdRequest;
import com.google.android.gms.ads.admanager.AdManagerAdView;
import com.google.common.collect.Lists;
import kotlin.Unit;
import org.jetbrains.annotations.NotNull;
import org.prebid.mobile.BannerAdUnit;
Expand Down Expand Up @@ -64,7 +63,7 @@ private void initUi(View root) {
private void onClickLoadAd() {
statusTextView.setText("");

ArrayList<OptableIdentifier.Email> ids = Lists.newArrayList(
List<OptableIdentifier> ids = Arrays.asList(
new OptableIdentifier.Email("test@test.com")
);
optable.targeting(ids, optableResult -> {
Expand Down
19 changes: 8 additions & 11 deletions DemoApp/DemoAppKotlin/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

android {
compileSdk 34
compileSdk 35
namespace "co.optable.androidsdkdemo"

defaultConfig {
Expand All @@ -16,8 +16,6 @@ android {
versionName "1.0.0"
archivesBaseName = "optable-android-sdk-demo-kotlin"

multiDexEnabled true

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand All @@ -41,7 +39,7 @@ android {
dependencies {
// Optable SDK
if (useReleaseSdk == "true") {
implementation "com.github.Optable:optable-android-sdk:1.0.0"
implementation "com.github.Optable:optable-android-sdk:v1.2.0"
} else {
implementation "co.optable:local-sdk"
}
Expand All @@ -54,13 +52,12 @@ dependencies {

// Base Android
implementation "org.jetbrains.kotlin:kotlin-stdlib:2.0.21"
implementation 'com.android.support:multidex:1.0.3'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.navigation:navigation-fragment-ktx:2.1.0'
implementation 'androidx.navigation:navigation-ui-ktx:2.1.0'
implementation 'androidx.navigation:navigation-fragment-ktx:2.8.9'
implementation 'androidx.navigation:navigation-ui-ktx:2.8.9'
implementation 'androidx.preference:preference-ktx:1.2.1'

// Testing
testImplementation 'junit:junit:4.13.1'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package co.optable.androidsdkdemo.ui

import android.os.Bundle
import android.preference.PreferenceManager
import android.util.Base64
import android.view.LayoutInflater
import android.view.View
Expand All @@ -10,6 +9,7 @@ import android.widget.Button
import android.widget.EditText
import android.widget.TextView
import androidx.fragment.app.Fragment
import androidx.preference.PreferenceManager
import co.optable.androidsdkdemo.R
import co.optable.androidsdkdemo.TheApplication
import co.optable.sdk.OptableIdentifier
Expand Down
Loading