Cesar/upgrading okhttp

.gitignore

@@ -12,6 +12,15 @@
 */bin/
 */gen/
 
+# gradle
+Fontify/.gradle/*
+SparkCore/.gradle/*
+
+# IntelliJ/AndroidStudio
+*.iml
+.idea/*
+
+
 # Local configuration file (sdk path, etc)
 */local.properties
 
@@ -24,6 +33,9 @@ SparkCore/res/values/local_build.xml
 # COMMENTED OUT: we want these.
 #.classpath
 #.project
-
 */.metadata/
 */.settings/
+
+# Resources
+SparkCore/assets/*
+SparkCore/libs/smartconfiglib.jar

Fontify/AndroidManifest.xml

@@ -1,13 +1,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.danh32.fontify"
-    android:versionCode="1"
-    android:versionName="1.0" >
+          package="com.danh32.fontify"
+          android:versionCode="1"
+          android:versionName="1.0">
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="19" />
+            android:minSdkVersion="14"
+            android:targetSdkVersion="22"/>
 
-    <application android:allowBackup="true" >
+    <application android:allowBackup="true">
     </application>
 
 </manifest>

Fontify/build.gradle

@@ -0,0 +1,35 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.1.0'
+    }
+}
+
+
+apply plugin: 'com.android.library'
+android {
+    compileSdkVersion 21
+    buildToolsVersion '22.0.0'
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 22
+        versionCode 1
+        versionName "1.0"
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['src']
+            res.srcDirs = ['res']
+        }
+    }
+}

Fontify/gradle.properties

@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# 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
+# org.gradle.parallel=true

Fontify/project.properties

@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-22
 android.library=true

SparkCore/AndroidManifest.xml

@@ -1,82 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.spark.core.android"
-    android:versionCode="4"
-    android:versionName="0.1.2" >
+          package="io.spark.core.android"
+          android:versionCode="4"
+          android:versionName="0.1.2">
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="19" />
+            android:minSdkVersion="14"
+            android:targetSdkVersion="22"/>
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
 
     <application
-        android:name="io.spark.core.android.app.SparkCoreApp"
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/Theme.CustomTypefaceGradientActionBar" >
+            android:name="io.spark.core.android.app.SparkCoreApp"
+            android:allowBackup="true"
+            android:icon="@drawable/ic_launcher"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.CustomTypefaceGradientActionBar">
 
         <!-- Activities -->
         <activity
-            android:name="io.spark.core.android.ui.SignUpActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.NoActionBar"
-            android:windowSoftInputMode="stateHidden|adjustResize" >
+                android:name="io.spark.core.android.ui.SignUpActivity"
+                android:screenOrientation="portrait"
+                android:theme="@style/Theme.NoActionBar"
+                android:windowSoftInputMode="stateHidden|adjustResize">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity
-            android:name="io.spark.core.android.ui.LoginActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.NoActionBar"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
+                android:name="io.spark.core.android.ui.LoginActivity"
+                android:screenOrientation="portrait"
+                android:theme="@style/Theme.NoActionBar"
+                android:windowSoftInputMode="stateHidden|adjustResize"/>
         <activity
-            android:name="io.spark.core.android.ui.smartconfig.SmartConfigActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.CustomTypefaceGradientActionBar.Overlay"
-            android:windowSoftInputMode="stateHidden|adjustResize" >
+                android:name="io.spark.core.android.ui.smartconfig.SmartConfigActivity"
+                android:screenOrientation="portrait"
+                android:theme="@style/Theme.CustomTypefaceGradientActionBar.Overlay"
+                android:windowSoftInputMode="stateHidden|adjustResize">
             <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="io.spark.core.android.ui.corelist.CoreListActivity" />
+                    android:name="android.support.PARENT_ACTIVITY"
+                    android:value="io.spark.core.android.ui.corelist.CoreListActivity"/>
         </activity>
         <activity
-            android:name="io.spark.core.android.ui.smartconfig.NamingActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.CustomTypefaceGradientActionBar.Overlay"
-            android:windowSoftInputMode="stateHidden|adjustResize" >
+                android:name="io.spark.core.android.ui.smartconfig.NamingActivity"
+                android:screenOrientation="portrait"
+                android:theme="@style/Theme.CustomTypefaceGradientActionBar.Overlay"
+                android:windowSoftInputMode="stateHidden|adjustResize">
             <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".SmartConfigActivity" />
+                    android:name="android.support.PARENT_ACTIVITY"
+                    android:value=".SmartConfigActivity"/>
         </activity>
         <activity
-            android:name="io.spark.core.android.ui.smartconfig.NoCoresFoundActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.CustomTypefaceGradientActionBar.Overlay"
-            android:windowSoftInputMode="stateHidden|adjustResize" >
+                android:name="io.spark.core.android.ui.smartconfig.NoCoresFoundActivity"
+                android:screenOrientation="portrait"
+                android:theme="@style/Theme.CustomTypefaceGradientActionBar.Overlay"
+                android:windowSoftInputMode="stateHidden|adjustResize">
             <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".SmartConfigActivity" />
+                    android:name="android.support.PARENT_ACTIVITY"
+                    android:value=".SmartConfigActivity"/>
         </activity>
         <activity
-            android:name="io.spark.core.android.ui.corelist.CoreListActivity"
-            android:launchMode="singleTop"
-            android:theme="@style/Theme.CustomTypefaceGradientActionBar.Overlay.NoUp" />
+                android:name="io.spark.core.android.ui.corelist.CoreListActivity"
+                android:launchMode="singleTop"
+                android:theme="@style/Theme.CustomTypefaceGradientActionBar.Overlay.NoUp"/>
 
         <!-- Services -->
         <service
-            android:name="io.spark.core.android.cloud.requestservice.SimpleSparkApiService"
-            android:exported="false" />
+                android:name="io.spark.core.android.cloud.requestservice.SimpleSparkApiService"
+                android:exported="false"/>
         <service
-            android:name="io.spark.core.android.smartconfig.SmartConfigService"
-            android:exported="false" />
+                android:name="io.spark.core.android.smartconfig.SmartConfigService"
+                android:exported="false"/>
     </application>
 
 </manifest>

SparkCore/build.gradle

@@ -0,0 +1,56 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.1.0'
+    }
+}
+
+apply plugin: 'com.android.application'
+
+repositories {
+    mavenCentral()
+}
+
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion '22.0.0'
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 22
+        versionCode 1
+        versionName "0.1.2"
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['src']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
+    }
+}
+
+dependencies {
+    compile project(':Fontify')
+
+//    compile fileTree(dir: 'libs', include: '*.jar')
+
+    compile files('libs/smartconfiglib.jar')
+    compile 'com.android.support:support-v4:22.0.+'
+    compile 'org.apache.commons:commons-lang3:3.0'
+    compile 'com.google.code.gson:gson:2.3.1'
+    compile 'com.google.guava:guava:18.0'
+    compile 'com.squareup.okhttp:okhttp:2.3.0'
+    compile 'com.squareup.okhttp:okhttp-urlconnection:2.3.0'
+}

SparkCore/gradle.properties

@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# 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
+# org.gradle.parallel=true

SparkCore/project.properties

@@ -11,5 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
-android.library.reference.1=../Fontify
+target=android-22

SparkCore/res/values/themes.xml

@@ -29,7 +29,6 @@
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowFrame">@null</item>
         <item name="android:windowContentOverlay">@null</item>
-        <item name="android:backgroundDimEnabled">false</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowNoTitle">true</item>
     </style>
@@ -39,5 +38,5 @@
         <item name="android:windowExitAnimation">@android:anim/fade_out</item>
     -->
 
-    
+
 </resources>