diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 38fd66a..72e6c4c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -9,8 +9,7 @@
-
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 8d5ba79..0f85397 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,10 +2,9 @@
-
-
-
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 3c14c42..3bec614 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,13 @@ android {
multiDexEnabled true
}
-
-
+ packagingOptions {
+ exclude 'META-INF/DEPENDENCIES'
+ exclude 'META-INF/NOTICE'
+ exclude 'META-INF/LICENSE'
+ exclude 'META-INF/LICENSE.txt'
+ exclude 'META-INF/NOTICE.txt'
+ }
buildTypes {
release {
@@ -36,16 +41,12 @@ android {
abi {
enable true
reset()
- include 'armeabi-v7a'
+ include 'armeabi-v7a', 'x86'
universalApk false
}
}
}
-dependencies {
- compile project(':common-prod-debug')
- compile project(':sdk-dev-debug')
-}
repositories {
flatDir {
@@ -63,7 +64,7 @@ dependencies {
compile 'com.android.support:design:25.3.1'
compile 'com.android.support:support-vector-drawable:25.3.1'
testCompile 'junit:junit:4.12'
-
+ compile project(':sdk-debug')
}
@@ -85,87 +86,6 @@ dependencies {
}
dependencies {
- //old
- /*
- compile fileTree(include: ['*.jar'], dir: 'libs')
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
- exclude group: 'com.android.support', module: 'support-annotations'
- })
-
-
- compile 'com.google.code.gson:gson:2.7'
- compile 'com.squareup.retrofit2:retrofit:2.1.0'
- compile 'com.squareup.retrofit2:converter-gson:2.1.0'
-
- //lm
- compile libs.ln
- compile 'com.android.support:multidex:1.0.1'
- compile libs.dagger
- provided libs.daggercompiler
-
- compile libs.eventbus
-
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
- exclude group: 'com.android.support', module: 'support-annotations'
- })
- testCompile 'junit:junit:4.12'
-
- compile libs.supportv13
- compile libs.supportannotation
- compile libs.appcompatv7
- compile libs.recyclerviewv7
- compile libs.cardviewv7
- compile libs.supportdesign
- compile libs.gridlayout
-
- compile libs.gson
-
- compile libs.retrofit
- compile libs.retrofit_gsonconverter
-
- compile libs.retrofit_deprecated
- compile libs.okhttp3_for_retrofit1
- compile libs.retrofit_rxjava
-
- compile libs.okhttp
- compile libs.okhttp_logging
- compile libs.websocket
-
- compile libs.dagger
- provided libs.daggercompiler
-
- compile libs.eventbus
-
- compile 'com.jakewharton:butterknife:7.0.1'
-
-
- compile libs.spongycastle_prov
- compile libs.spongycastle_core
- compile libs.kms
-
-
- compile libs.wmeaar
-
- compile libs.rxjava
- compile libs.rxandroid
-
- compile libs.will
-
- debugCompile libs.leak_canary
- releaseCompile libs.leak_canary_disabled
- testCompile libs.leak_canary_disabled
- androidTestCompile libs.leak_canary_disabled
-
- compile libs.rxrelay
-
- testCompile libs.junit
- testCompile libs.robolectric
- testCompile libs.robolectric_multidex
- testCompile libs.mockito
- compile 'joda-time:joda-time:2.9.2'
-
- */
-
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
@@ -207,11 +127,9 @@ dependencies {
compile libs.sqlcipher
- /*
compile libs.fasterxml_annotations
compile libs.fasterxml_databind
compile libs.fasterxml_core
- */
debugCompile libs.leak_canary
releaseCompile libs.leak_canary_disabled
@@ -228,6 +146,7 @@ dependencies {
compile 'com.cisco.wx2:diagnostic-events-gson:1.0.86'
compile 'com.segment.analytics.android:analytics:4.3.0-RC1'
+ compile 'com.cisco.spark.android:common-lib:2.0.3886@aar'
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 25625bd..2a120a5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -56,6 +56,11 @@
+
\ No newline at end of file
diff --git a/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/CallActivity.java b/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/CallActivity.java
index 0ab903c..bffddd7 100644
--- a/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/CallActivity.java
+++ b/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/CallActivity.java
@@ -12,7 +12,7 @@
import android.widget.TextView;
import android.widget.Toast;
-import com.ciscospark.common.SparkError;
+import com.ciscospark.SparkError;
import com.ciscospark.phone.Call;
import com.ciscospark.phone.CallOption;
import com.ciscospark.phone.DialObserver;
@@ -36,7 +36,7 @@ public class CallActivity extends AppCompatActivity {
public Call mActiveCall;
private MyCallObserver mActiveCallObserver;
- private KitchenSinkApplication myapplication;
+ private KitchenSinkApplication myApplication;
Button hangupButton;
@@ -54,7 +54,7 @@ protected void onCreate(Bundle savedInstanceState) {
localView = (WseSurfaceView) findViewById(R.id.localView);
remoteView = (WseSurfaceView) findViewById(R.id.remoteView);
- myapplication = (KitchenSinkApplication)getApplication();
+ myApplication = (KitchenSinkApplication)getApplication();
mActiveCallObserver = new MyCallObserver(this);
@@ -105,9 +105,8 @@ private void setupWaitingCallFragment() {
private void waitForIncomingCall() {
KitchenSinkApplication application = (KitchenSinkApplication) getApplication();
- if (application.mSpark.getStrategy().isAuthorized()) {
- Phone phone = application.mSpark.phone();
- phone.setIncomingCallObserver(new IncomingCallObserver() {
+ if (application.mSpark.getAuthenticator().isAuthorized()) {
+ application.mPhone.setIncomingCallObserver(new IncomingCallObserver() {
@Override
public void onIncomingCall(Call call) {
mActiveCall = call;
@@ -143,8 +142,8 @@ public void answerCall() {
private void call(){
Log.i(TAG, "call: ->start");
- this.dialCallee = myapplication.callee;
- this.isAudioCall = myapplication.isAudioCall;
+ this.dialCallee = myApplication.callee;
+ this.isAudioCall = myApplication.isAudioCall;
if(this.isAudioCall){
this.audioCall(this.dialCallee);
@@ -177,7 +176,7 @@ private void videoCall(String dialstring) {
CallOption options = new CallOption(CallOption.CallType.VIDEO, this.remoteView, this.localView);
- this.myapplication.mSpark.phone().dial(dialstring, options, new DialObserver() {
+ this.myApplication.mPhone.dial(dialstring, options, new DialObserver() {
@Override
public void onSuccess(Call call) {
Log.i(TAG, "DialObserver-> onSuccess");
@@ -206,7 +205,7 @@ public void onPermissionRequired(List list) {
private void audioCall(String dialstring) {
Log.i(TAG, "audioCall: ->start");
CallOption options = new CallOption(CallOption.CallType.AUDIO, null, null);
- this.myapplication.mSpark.phone().dial(dialstring, options, new DialObserver() {
+ this.myApplication.mSpark.phone().dial(dialstring, options, new DialObserver() {
@Override
public void onSuccess(Call call) {
Log.i(TAG, "DialObserver-> onSuccess");
diff --git a/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/JWTActivity.java b/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/JWTActivity.java
index 8d81e41..608bc88 100644
--- a/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/JWTActivity.java
+++ b/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/JWTActivity.java
@@ -1,20 +1,19 @@
package com.cisco.sparksdk.sparkkitchensink;
import android.content.Intent;
+import android.os.Bundle;
import android.os.Handler;
import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Toast;
-import com.cisco.spark.android.authenticator.OAuth2AccessToken;
+import com.ciscospark.CompletionHandler;
+import com.ciscospark.SparkError;
import com.ciscospark.auth.Authenticator;
-import com.ciscospark.auth.AuthorizeListener;
import com.ciscospark.auth.JWTAuthenticator;
-import com.ciscospark.common.SparkError;
public class JWTActivity extends AppCompatActivity {
@@ -25,7 +24,7 @@ public class JWTActivity extends AppCompatActivity {
private Authenticator strategy;
- private KitchenSinkApplication myapplication;
+ private KitchenSinkApplication myApplication;
@Override
@@ -33,7 +32,7 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_jwt);
- myapplication = (KitchenSinkApplication)getApplication();
+ myApplication = (KitchenSinkApplication) getApplication();
Log.i(TAG, "onCreate: ->start");
@@ -45,58 +44,51 @@ public void onClick(View v) {
String jwtKey = editTextJWT.getText().toString();
if (jwtKey.isEmpty()) {
+ /*
Toast.makeText(JWTActivity.this, "JWT Token cannot be empty", Toast
.LENGTH_SHORT).show();
return;
+ */
+ jwtKey = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJ1c2VyMSIsIm5hbWUiOiJ1c2VyICMxIiwiaXNzIjoiY2Q1YzlhZjctOGVkMy00ZTE1LTk3MDUtMDI1ZWYzMGIxYjZhIn0.nQTlT_WwkHdWZTCNi4tVl2IA476nAWo34oxtuTlLSDk";
}
Toast.makeText(JWTActivity.this, "JWT authoring", Toast.LENGTH_SHORT).show();
- JWTAuthenticator authenticator = new JWTAuthenticator();
+ JWTAuthenticator authenticator = new JWTAuthenticator(jwtKey);
strategy = authenticator;
-
-
- JWTActivity.this.myapplication.mSpark.init(strategy);
-
- authenticator.authorize(jwtKey);
- if (strategy.isAuthorized()) {
- strategy.accessToken(new AuthorizeListener() {
- @Override
- public void onSuccess(OAuth2AccessToken token) {
- Log.d(TAG, token.getAccessToken());
- Toast.makeText(JWTActivity.this, "JWT auth success", Toast.LENGTH_SHORT).show();
-
- Intent intent = new Intent(JWTActivity.this, RegistryActivity.class);
-
- JWTActivity.this.startActivity(intent);
-
- }
-
- @Override
- public void onFailed(SparkError error) {
- Toast.makeText(JWTActivity.this, "JWT auth failed", Toast.LENGTH_SHORT).show();
- }
- });
- }
-
+ myApplication.mSpark.setAuthenticator(strategy);
+
+ myApplication.mSpark.authorize(new CompletionHandler() {
+ @Override
+ public void onComplete(String s) {
+ Log.d(TAG, s);
+ Toast.makeText(JWTActivity.this, "JWT auth success", Toast.LENGTH_SHORT).show();
+ Intent intent = new Intent(JWTActivity.this, RegistryActivity.class);
+ JWTActivity.this.startActivity(intent);
+ }
+
+ @Override
+ public void onError(SparkError sparkError) {
+ Toast.makeText(JWTActivity.this, "JWT auth failed", Toast.LENGTH_SHORT).show();
+ }
+ });
}
-
});
}
private boolean exit = false;
+
@Override
public void onBackPressed() {
if (exit) {
this.finish();
- }
- else {
- Toast.makeText(this, "Press Back again to Exit.",Toast.LENGTH_SHORT).show();
+ } else {
+ Toast.makeText(this, "Press Back again to Exit.", Toast.LENGTH_SHORT).show();
exit = true;
new Handler().postDelayed(new Runnable() {
@Override
diff --git a/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/KitchenSinkApplication.java b/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/KitchenSinkApplication.java
index ec54a72..ae22c43 100644
--- a/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/KitchenSinkApplication.java
+++ b/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/KitchenSinkApplication.java
@@ -14,6 +14,7 @@
public class KitchenSinkApplication extends SparkApplication {
public Spark mSpark;
+ public Phone mPhone;
public OAuth2AccessToken token;
diff --git a/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/MyCallObserver.java b/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/MyCallObserver.java
index 24bf576..fdfa689 100644
--- a/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/MyCallObserver.java
+++ b/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/MyCallObserver.java
@@ -3,8 +3,9 @@
import android.util.Log;
import android.widget.Toast;
-import com.ciscospark.common.SparkError;
+import com.ciscospark.SparkError;
import com.ciscospark.phone.Call;
+import com.ciscospark.phone.CallObserver;
public class MyCallObserver implements com.ciscospark.phone.CallObserver {
@@ -87,11 +88,9 @@ public void onDisconnected(Call call, DisconnectedReason reason, SparkError erro
}
@Override
- public void onMediaChanged(Call call, MediaChangeReason reason) {
+ public void onMediaChanged(Call call, MediaChangedEvent mediaChangedEvent) {
Log.i(TAG, "onMediaChanged: ->start");
- Log.i(TAG, "reason is " + reason);
+ Log.i(TAG, "reason is " + mediaChangedEvent);
}
-
-
}
diff --git a/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/OAuth2Fragment.java b/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/OAuth2Fragment.java
index 5e17cf0..26f0a59 100644
--- a/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/OAuth2Fragment.java
+++ b/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/OAuth2Fragment.java
@@ -3,7 +3,6 @@
import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
-import android.net.Uri;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@@ -11,10 +10,9 @@
import android.webkit.WebView;
import android.widget.Toast;
-import com.cisco.spark.android.authenticator.OAuth2AccessToken;
-import com.ciscospark.auth.AuthorizeListener;
-import com.ciscospark.auth.OAuth2Authenticator;
-import com.ciscospark.common.SparkError;
+import com.ciscospark.CompletionHandler;
+import com.ciscospark.auth.OAuthWebViewAuthenticator;
+import com.ciscospark.SparkError;
/**
@@ -67,18 +65,18 @@ private void authorize(View rootView) {
String redirect = "AndroidDemoApp://response";
String scope = "spark:all spark:kms";
WebView webView = (WebView)rootView.findViewById(R.id.OAuthWebView);
- OAuth2Authenticator authenticator = new OAuth2Authenticator(clientId,clientSec,redirect,scope);
- ((KitchenSinkApplication)getActivity().getApplication()).mSpark.setStrategy(authenticator);
+ OAuthWebViewAuthenticator authenticator = new OAuthWebViewAuthenticator(clientId,clientSec,redirect,scope,"",webView);
+ ((KitchenSinkApplication)getActivity().getApplication()).mSpark.setAuthenticator(authenticator);
if (!authenticator.isAuthorized()) {
- authenticator.authorize(webView, new AuthorizeListener() {
+ authenticator.authorize(new CompletionHandler() {
@Override
- public void onSuccess(OAuth2AccessToken oAuth2AccessToken) {
+ public void onComplete(String oAuth2AccessToken) {
startActivity(new Intent(getActivity(), RegistryActivity.class));
getActivity().finish();
}
@Override
- public void onFailed(SparkError sparkError) {
+ public void onError(SparkError sparkError) {
Toast.makeText(getActivity(), "Authorize error: " + sparkError.toString(), Toast.LENGTH_SHORT).show();
}
});
diff --git a/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/RegistryActivity.java b/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/RegistryActivity.java
index c63e2fa..ff2dfc7 100644
--- a/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/RegistryActivity.java
+++ b/app/src/main/java/com/cisco/sparksdk/sparkkitchensink/RegistryActivity.java
@@ -10,7 +10,7 @@
import android.widget.TextView;
import android.widget.Toast;
-import com.ciscospark.common.SparkError;
+import com.ciscospark.SparkError;
import com.ciscospark.phone.DeregisterListener;
import com.ciscospark.phone.RegisterListener;
@@ -27,7 +27,7 @@ public class RegistryActivity extends AppCompatActivity {
private boolean isRegistered = false;
- private KitchenSinkApplication myapplication;
+ private KitchenSinkApplication myApplication;
private TextView viewStatus;
@@ -37,7 +37,7 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_registry);
- myapplication = (KitchenSinkApplication)getApplication();
+ myApplication = (KitchenSinkApplication)getApplication();
viewStatus = (TextView) findViewById(R.id.textViewStatus);
@@ -113,7 +113,7 @@ public void run() {
private void logout(){
Log.i(TAG, "logout: ->start");
- this.myapplication.mSpark.phone().deregister(new DeregisterListener() {
+ this.myApplication.mSpark.phone().deregister(new DeregisterListener() {
@Override
public void onSuccess() {
Toast.makeText(RegistryActivity.this, "Deregister successfully", Toast.LENGTH_SHORT)
@@ -179,7 +179,8 @@ private void registerToLocus(){
Log.i(TAG, "begin to register");
- this.myapplication.mSpark.phone().register(new RegisterListener() {
+ myApplication.mPhone = myApplication.mSpark.phone();
+ this.myApplication.mPhone.register(new RegisterListener() {
@Override
public void onSuccess() {
Log.i(TAG, "register successfully");
diff --git a/build.gradle b/build.gradle
index 39348e0..0375d09 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,22 +1,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
-//old
-/*
-buildscript {
- repositories {
- jcenter()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
- classpath 'me.tatarka:gradle-retrolambda:3.5.0'
-
- // NOTE: Do not place your application dependencies here; they belong
- // in the individual module build.gradle files
- }
-}
-*/
-
-//new commonlib
buildscript {
repositories {
jcenter()
@@ -32,36 +15,13 @@ buildscript {
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+'
// Hardcode 1.20.0. 1.21.0 crashes the app.
classpath 'io.fabric.tools:gradle:1.20.0'
- classpath "com.android.tools.build:gradle:$gradleVersion"
+ classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.github.triplet.gradle:play-publisher:1.1.5'
classpath 'me.tatarka:gradle-retrolambda:3.5.0'
}
}
-/*
-allprojects {
- repositories {
- jcenter()
- maven {
- url 'https://maven.fabric.io/public'
- }
- maven {
- url 'http://engci-maven.cisco.com/artifactory/webex-cca-thirdparty'
- }
- maven {
- url 'http://engci-maven.cisco.com/artifactory/webex-cca-release'
- }
- maven {
- url 'http://engci-maven.cisco.com/artifactory/webex-cca-group'
- }
- maven {
- url 'http://engci-maven.cisco.com/artifactory/androidwb-group/'
- }
- }
-}
-*/
-//new commonlib
allprojects {
repositories {
mavenLocal()
@@ -81,80 +41,12 @@ allprojects {
maven {
url 'http://engci-maven.cisco.com/artifactory/androidwb-group/'
}
+ maven {
+ url 'http://10.140.253.42:10081/nexus/content/repositories/thirdparty/'
+ }
}
}
-
-//old
-/*
-ext {
- versions = [
- wme : System.env.WME_VERSION == null ? '7.0.0' : System.env.WME_VERSION,
- support : '25.1.1',
- okhttp: '3.2.0',
- retrofit: '2.0.2'
- ]
-
- libs = [
- supportv13 : "com.android.support:support-v13:$versions.support",
- supportannotation : "com.android.support:support-annotations:$versions.support",
- appcompatv7 : "com.android.support:appcompat-v7:$versions.support",
- recyclerviewv7 : "com.android.support:recyclerview-v7:$versions.support",
- cardviewv7 : "com.android.support:cardview-v7:$versions.support",
- supportdesign : "com.android.support:design:$versions.support",
- gridlayout : "com.android.support:gridlayout-v7:$versions.support",
- percent : "com.android.support:percent:$versions.support",
-
- gson : 'com.google.code.gson:gson:2.6.2',
-
- dagger : 'com.squareup.dagger:dagger:1.2.2',
- daggercompiler : 'com.squareup.dagger:dagger-compiler:1.2.2',
-
- retrofit : "com.squareup.retrofit2:retrofit:$versions.retrofit",
- retrofit_deprecated : "com.squareup.retrofit:retrofit:1.9.0",
- okhttp3_for_retrofit1 : "com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0",
- retrofit_gsonconverter : "com.squareup.retrofit2:converter-gson:$versions.retrofit",
- retrofit_rxjava: "com.squareup.retrofit2:adapter-rxjava:$versions.retrofit",
-
- okhttp : "com.squareup.okhttp3:okhttp:$versions.okhttp",
- okhttp_logging : "com.squareup.okhttp3:logging-interceptor:$versions.okhttp",
- websocket: "org.java-websocket:Java-WebSocket:1.3.1.1",
-
- eventbus : 'de.greenrobot:eventbus:2.4.0',
- ln : 'com.github.benoitdion.ln:ln:0.1.2',
-
- wmeaar: "com.webex:wme4android-release:${versions.wme}@aar",
-
- spongycastle_prov: "com.madgag.spongycastle:prov:1.54.0.0",
- spongycastle_core: "com.madgag.spongycastle:core:1.54.0.0",
- kms: "com.cisco.wx2:cloud-apps-sdk-kms:1.0.17991",
-
- rxjava :'io.reactivex:rxjava:1.1.1',
- rxandroid: "io.reactivex:rxandroid:1.1.0",
- rxrelay: "com.jakewharton.rxrelay:rxrelay:1.2.0",
-
- will: "com.wacom.ink.library:willSDK:1.7.0@aar",
-
- leak_canary: "com.squareup.leakcanary:leakcanary-android:1.5",
- leak_canary_disabled: "com.squareup.leakcanary:leakcanary-android-no-op:1.5",
-
- sqlcipher: "net.zetetic:android-database-sqlcipher:3.5.3@aar",
-
- // Test libs
- junit: 'junit:junit:4.+',
- robolectric: 'org.robolectric:robolectric:3.0',
- robolectric_support: 'org.robolectric:shadows-support-v4:3.0',
- robolectric_httpclient: 'org.robolectric:shadows-httpclient:3.0',
- robolectric_multidex: "org.robolectric:shadows-multidex:3.0",
- mockito: 'org.mockito:mockito-core:2.0.7-beta',
-
- joda: 'joda-time:joda-time:2.9.2'
- ]
-}
-
-*/
-
-//new
ext {
versions = [
wme : System.env.WME_VERSION == null ? '7.7.0' : System.env.WME_VERSION,
diff --git a/common-prod-debug/build.gradle b/common-prod-debug/build.gradle
deleted file mode 100644
index 71123da..0000000
--- a/common-prod-debug/build.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-configurations.maybeCreate("default")
-artifacts.add("default", file('common-prod-debug.aar'))
\ No newline at end of file
diff --git a/common-prod-debug/common-prod-debug.aar b/common-prod-debug/common-prod-debug.aar
deleted file mode 100644
index 9c7321a..0000000
Binary files a/common-prod-debug/common-prod-debug.aar and /dev/null differ
diff --git a/sdk-debug/build.gradle b/sdk-debug/build.gradle
new file mode 100644
index 0000000..35c23e3
--- /dev/null
+++ b/sdk-debug/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('sdk-debug.aar'))
\ No newline at end of file
diff --git a/sdk-debug/sdk-debug.aar b/sdk-debug/sdk-debug.aar
new file mode 100644
index 0000000..3a63645
Binary files /dev/null and b/sdk-debug/sdk-debug.aar differ
diff --git a/sdk-dev-debug/build.gradle b/sdk-dev-debug/build.gradle
deleted file mode 100644
index 358bcad..0000000
--- a/sdk-dev-debug/build.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-configurations.maybeCreate("default")
-artifacts.add("default", file('sdk-dev-debug.aar'))
\ No newline at end of file
diff --git a/sdk-dev-debug/sdk-dev-debug.aar b/sdk-dev-debug/sdk-dev-debug.aar
deleted file mode 100644
index 1d1fc03..0000000
Binary files a/sdk-dev-debug/sdk-dev-debug.aar and /dev/null differ
diff --git a/settings.gradle b/settings.gradle
index 7ab0459..1e0f9c0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':common-prod-debug', ':sdk-dev-debug'
+include ':app', ':sdk-debug'