use default gradle structure + updated build tools

freshplanet · Jul 5, 2017 · b99e0ea · b99e0ea
1 parent fdfa967
commit b99e0ea
Show file tree

Hide file tree

Showing 42 changed files with 37 additions and 60 deletions.
diff --git a/.gitignore b/.gitignore
@@ -57,3 +57,5 @@ build/platform-android-template\.xml
 sample/out/
 
 build/intermediates/
+
+android/lib/build/
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,33 +1,17 @@
 
-apply plugin: 'com.android.library'
+buildscript {
 
-dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.facebook.android:facebook-android-sdk:4.19.0'
-}
-
-android {
-
-    useLibrary  'org.apache.http.legacy'
-
-    compileSdkVersion 25
-    buildToolsVersion '25.0.2'
-
-    defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 22
+    repositories {
+        jcenter()
     }
 
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            res.srcDirs = ['res']
-        }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
+}
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+allprojects {
+    repositories {
+        jcenter()
     }
-}
+}
diff --git a/gradle.properties → android/gradle.properties b/gradle.properties → android/gradle.properties
diff --git a/gradle/wrapper.gradle → android/gradle/wrapper.gradle b/gradle/wrapper.gradle → android/gradle/wrapper.gradle
diff --git a/gradle/wrapper/gradle-wrapper.jar → android/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar → android/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew → android/gradlew b/gradlew → android/gradlew
diff --git a/gradlew.bat → android/gradlew.bat b/gradlew.bat → android/gradlew.bat
diff --git a/android/lib/build.gradle b/android/lib/build.gradle
@@ -0,0 +1,20 @@
+
+apply plugin: 'com.android.library'
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.facebook.android:facebook-android-sdk:4.19.0'
+}
+
+android {
+
+    useLibrary  'org.apache.http.legacy'
+
+    compileSdkVersion 25
+    buildToolsVersion '25.0.3'
+
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 22
+    }
+}
diff --git a/android/libs/FlashRuntimeExtensions.jar → android/lib/libs/FlashRuntimeExtensions.jar b/android/libs/FlashRuntimeExtensions.jar → android/lib/libs/FlashRuntimeExtensions.jar
diff --git a/android/libs/runtimeClasses.jar → android/lib/libs/runtimeClasses.jar b/android/libs/runtimeClasses.jar → android/lib/libs/runtimeClasses.jar
diff --git a/android/AndroidManifest.xml → android/lib/src/main/AndroidManifest.xml b/android/AndroidManifest.xml → android/lib/src/main/AndroidManifest.xml
diff --git a/...ir/AirFacebookActivityResultCallback.java → ...ir/AirFacebookActivityResultCallback.java b/...ir/AirFacebookActivityResultCallback.java → ...ir/AirFacebookActivityResultCallback.java
diff --git a/...be/air/AirFacebookInputEventCallback.java → ...be/air/AirFacebookInputEventCallback.java b/...be/air/AirFacebookInputEventCallback.java → ...be/air/AirFacebookInputEventCallback.java
diff --git a/...e/air/AirFacebookStateChangeCallback.java → ...e/air/AirFacebookStateChangeCallback.java b/...e/air/AirFacebookStateChangeCallback.java → ...e/air/AirFacebookStateChangeCallback.java
diff --git a/...net/ane/AirFacebook/AirFacebookError.java → ...net/ane/AirFacebook/AirFacebookError.java b/...net/ane/AirFacebook/AirFacebookError.java → ...net/ane/AirFacebook/AirFacebookError.java
diff --git a/...ane/AirFacebook/AirFacebookExtension.java → ...ane/AirFacebook/AirFacebookExtension.java b/...ane/AirFacebook/AirFacebookExtension.java → ...ane/AirFacebook/AirFacebookExtension.java
diff --git a/...Facebook/AirFacebookExtensionContext.java → ...Facebook/AirFacebookExtensionContext.java b/...Facebook/AirFacebookExtensionContext.java → ...Facebook/AirFacebookExtensionContext.java
diff --git a/...planet/ane/AirFacebook/LoginActivity.java → ...planet/ane/AirFacebook/LoginActivity.java b/...planet/ane/AirFacebook/LoginActivity.java → ...planet/ane/AirFacebook/LoginActivity.java
diff --git a/...planet/ane/AirFacebook/RequestThread.java → ...planet/ane/AirFacebook/RequestThread.java b/...planet/ane/AirFacebook/RequestThread.java → ...planet/ane/AirFacebook/RequestThread.java
diff --git a/...ok/functions/AppInviteDialogFunction.java → ...ok/functions/AppInviteDialogFunction.java b/...ok/functions/AppInviteDialogFunction.java → ...ok/functions/AppInviteDialogFunction.java
diff --git a/...e/AirFacebook/functions/BaseFunction.java → ...e/AirFacebook/functions/BaseFunction.java b/...e/AirFacebook/functions/BaseFunction.java → ...e/AirFacebook/functions/BaseFunction.java
diff --git a/...ns/CanPresentAppInviteDialogFunction.java → ...ns/CanPresentAppInviteDialogFunction.java b/...ns/CanPresentAppInviteDialogFunction.java → ...ns/CanPresentAppInviteDialogFunction.java
diff --git a/...ctions/CanPresentShareDialogFunction.java → ...ctions/CanPresentShareDialogFunction.java b/...ctions/CanPresentShareDialogFunction.java → ...ctions/CanPresentShareDialogFunction.java
diff --git a/...book/functions/DeactivateAppFunction.java → ...book/functions/DeactivateAppFunction.java b/...book/functions/DeactivateAppFunction.java → ...book/functions/DeactivateAppFunction.java
diff --git a/.../functions/GameRequestDialogFunction.java → .../functions/GameRequestDialogFunction.java b/.../functions/GameRequestDialogFunction.java → .../functions/GameRequestDialogFunction.java
diff --git a/...ook/functions/GetAccessTokenFunction.java → ...ook/functions/GetAccessTokenFunction.java b/...ook/functions/GetAccessTokenFunction.java → ...ook/functions/GetAccessTokenFunction.java
diff --git a/...acebook/functions/GetProfileFunction.java → ...acebook/functions/GetProfileFunction.java b/...acebook/functions/GetProfileFunction.java → ...acebook/functions/GetProfileFunction.java
diff --git a/...ebook/functions/InitFacebookFunction.java → ...ebook/functions/InitFacebookFunction.java b/...ebook/functions/InitFacebookFunction.java → ...ebook/functions/InitFacebookFunction.java
diff --git a/...rFacebook/functions/LogEventFunction.java → ...rFacebook/functions/LogEventFunction.java b/...rFacebook/functions/LogEventFunction.java → ...rFacebook/functions/LogEventFunction.java
diff --git a/...nctions/LogInWithPermissionsFunction.java → ...nctions/LogInWithPermissionsFunction.java b/...nctions/LogInWithPermissionsFunction.java → ...nctions/LogInWithPermissionsFunction.java
diff --git a/...unctions/OpenDeferredAppLinkFunction.java → ...unctions/OpenDeferredAppLinkFunction.java b/...unctions/OpenDeferredAppLinkFunction.java → ...unctions/OpenDeferredAppLinkFunction.java
diff --git a/...nctions/RequestWithGraphPathFunction.java → ...nctions/RequestWithGraphPathFunction.java b/...nctions/RequestWithGraphPathFunction.java → ...nctions/RequestWithGraphPathFunction.java
diff --git a/...functions/SetDefaultAudienceFunction.java → ...functions/SetDefaultAudienceFunction.java b/...functions/SetDefaultAudienceFunction.java → ...functions/SetDefaultAudienceFunction.java
diff --git a/...ns/SetDefaultShareDialogModeFunction.java → ...ns/SetDefaultShareDialogModeFunction.java b/...ns/SetDefaultShareDialogModeFunction.java → ...ns/SetDefaultShareDialogModeFunction.java
diff --git a/...k/functions/SetLoginBehaviorFunction.java → ...k/functions/SetLoginBehaviorFunction.java b/...k/functions/SetLoginBehaviorFunction.java → ...k/functions/SetLoginBehaviorFunction.java
diff --git a/...ok/functions/ShareLinkDialogFunction.java → ...ok/functions/ShareLinkDialogFunction.java b/...ok/functions/ShareLinkDialogFunction.java → ...ok/functions/ShareLinkDialogFunction.java
diff --git a/.../AirFacebook/utils/FREConversionUtil.java → .../AirFacebook/utils/FREConversionUtil.java b/.../AirFacebook/utils/FREConversionUtil.java → .../AirFacebook/utils/FREConversionUtil.java
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -0,0 +1 @@
+include ':lib'
diff --git a/build.gradle b/build.gradle
diff --git a/build/build.xml b/build/build.xml
@@ -46,7 +46,7 @@
     <target name="android" description="Build Android Library">
 
         <!-- paths -->
-        <property name="build.intermediates" value="../android/build/intermediates"/>
+        <property name="build.intermediates" value="../android/lib/build/intermediates"/>
         <property name="build.release" value="${build.intermediates}/bundles/release"/>
         <property name="build.exploded-aar" value="${build.intermediates}/exploded-aar"/>
 
@@ -58,16 +58,16 @@
         </exec>
 
         <!-- clean the build -->
-        <exec executable="./gradlew" dir="..">
+        <exec executable="./gradlew" dir="../android">
             <env key="JAVA_HOME" path="${java.home}"/>
             <arg line="clean"/>
         </exec>
 
         <!-- compile the java code -->
-        <exec executable="./gradlew" dir="..">
+        <exec executable="./gradlew" dir="../android">
             <env key="JAVA_HOME" path="${java.home}"/>
             <env key="ANDROID_HOME" path="${android.sdk.home}"/>
-            <arg line=":android:assembleRelease"/>
+            <arg line=":lib:assembleRelease"/>
         </exec>
 
         <!-- get the jar -->
@@ -87,9 +87,6 @@
         <exec executable="/bin/bash">
             <arg value="extractJars.sh"/>
         </exec>
-
-        <!-- remove the build classes -->
-        <delete dir="../android/build"/>
     </target>
 
     <!-- Actionscript -->

diff --git a/settings.gradle b/settings.gradle