gradle!

examples/Demo/proj.android/build-run.bat

@@ -1,4 +1,4 @@
-call ndk-build NDK_MODULE_PATH="../../../../"
+rem call ndk-build NDK_MODULE_PATH="../../../../"
 call gradlew assembleDebug
-call adb install -r build/outputs/apk/proj.android-debug.apk
+call adb install -r build/outputs/apk/debug/proj.android-debug.apk
 call adb shell am start -n org.oxygine.Demo/org.oxygine.Demo.MainActivity

examples/Demo/proj.android/build-run.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-ndk-build NDK_MODULE_PATH="../../../../"
+#ndk-build NDK_MODULE_PATH="../../../../"
 gradlew assembleDebug
-adb install -r build/outputs/apk/proj.android-debug.apk
+adb install -r build/outputs/apk/debug/proj.android-debug.apk
 adb shell am start -n org.oxygine.Demo/org.oxygine.Demo.MainActivity

examples/Demo/proj.android/build.gradle

@@ -3,9 +3,10 @@ buildscript {
         mavenLocal()
         mavenCentral()
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.+'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
@@ -14,15 +15,13 @@ apply plugin: 'com.android.application'
 
 
 dependencies {
-    compile(project(':oxygine-extension'))
-    compile(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
+    implementation(project(':oxygine-extension'))
+    implementation(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
 }
 
 android {
-    enforceUniquePackageName=false
         
     compileSdkVersion 23
-    buildToolsVersion '23.0.2'
 
 
     sourceSets {
@@ -35,8 +34,26 @@ android {
         }
     }
 
+    defaultConfig {
+        ndk {
+            abiFilters 'armeabi-v7a'//, 'arm64-v8a'
+        }
+
+        externalNativeBuild {
+            ndkBuild {
+                arguments 'NDK_MODULE_PATH+=../../../../'
+            }
+        }
+    }
+
+    externalNativeBuild {
+        ndkBuild {
+            path 'jni/Android.mk'
+        }
+    }
+
     aaptOptions {
         noCompress 'zip', 'ogg'
-        ignoreAssetsPattern "!*.dll:*.icf"
+        ignoreAssetsPattern "!*.dll"
     }
 }

examples/Demo/proj.android/gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Sat Dec 30 01:17:50 YEKT 2017
+#Wed Nov 01 12:35:02 YEKT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

examples/DemoBox2D/proj.android/build-run.bat

@@ -1,4 +1,4 @@
-call ndk-build NDK_MODULE_PATH="../../../../"
+rem call ndk-build NDK_MODULE_PATH="../../../../"
 call gradlew assembleDebug
-call adb install -r build/outputs/apk/proj.android-debug.apk
+call adb install -r build/outputs/apk/debug/proj.android-debug.apk
 call adb shell am start -n org.oxygine.DemoBox2D/org.oxygine.DemoBox2D.MainActivity

examples/DemoBox2D/proj.android/build-run.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-ndk-build NDK_MODULE_PATH="../../../../"
+#ndk-build NDK_MODULE_PATH="../../../../"
 gradlew assembleDebug
-adb install -r build/outputs/apk/proj.android-debug.apk
+adb install -r build/outputs/apk/debug/proj.android-debug.apk
 adb shell am start -n org.oxygine.DemoBox2D/org.oxygine.DemoBox2D.MainActivity

examples/DemoBox2D/proj.android/build.gradle

@@ -3,9 +3,10 @@ buildscript {
         mavenLocal()
         mavenCentral()
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.+'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
@@ -14,15 +15,13 @@ apply plugin: 'com.android.application'
 
 
 dependencies {
-    compile(project(':oxygine-extension'))
-    compile(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
+    implementation(project(':oxygine-extension'))
+    implementation(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
 }
 
 android {
-    enforceUniquePackageName=false
         
     compileSdkVersion 23
-    buildToolsVersion '23.0.2'
 
 
     sourceSets {
@@ -35,8 +34,26 @@ android {
         }
     }
 
+    defaultConfig {
+        ndk {
+            abiFilters 'armeabi-v7a'//, 'arm64-v8a'
+        }
+
+        externalNativeBuild {
+            ndkBuild {
+                arguments 'NDK_MODULE_PATH+=../../../../'
+            }
+        }
+    }
+
+    externalNativeBuild {
+        ndkBuild {
+            path 'jni/Android.mk'
+        }
+    }
+
     aaptOptions {
         noCompress 'zip', 'ogg'
-        ignoreAssetsPattern "!*.dll:*.icf"
+        ignoreAssetsPattern "!*.dll"
     }
 }

examples/DemoBox2D/proj.android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Feb 03 15:44:28 YEKT 2017
+#Wed Nov 01 12:35:02 YEKT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

examples/Game/part1/proj.android/build-run.bat

@@ -1,4 +1,4 @@
-call ndk-build NDK_MODULE_PATH="../../../../../"
+rem call ndk-build NDK_MODULE_PATH="../../../../"
 call gradlew assembleDebug
-call adb install -r build/outputs/apk/proj.android-debug.apk
+call adb install -r build/outputs/apk/debug/proj.android-debug.apk
 call adb shell am start -n org.oxygine.GamePart1/org.oxygine.GamePart1.MainActivity

examples/Game/part1/proj.android/build-run.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-ndk-build NDK_MODULE_PATH="../../../../../"
+#ndk-build NDK_MODULE_PATH="../../../../"
 gradlew assembleDebug
-adb install -r build/outputs/apk/proj.android-debug.apk
+adb install -r build/outputs/apk/debug/proj.android-debug.apk
 adb shell am start -n org.oxygine.GamePart1/org.oxygine.GamePart1.MainActivity

examples/Game/part1/proj.android/build.gradle

@@ -3,9 +3,10 @@ buildscript {
         mavenLocal()
         mavenCentral()
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.+'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
@@ -14,15 +15,13 @@ apply plugin: 'com.android.application'
 
 
 dependencies {
-    compile(project(':oxygine-extension'))
-    compile(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
+    implementation(project(':oxygine-extension'))
+    implementation(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
 }
 
 android {
-    enforceUniquePackageName=false
         
     compileSdkVersion 23
-    buildToolsVersion '23.0.2'
 
 
     sourceSets {
@@ -35,8 +34,26 @@ android {
         }
     }
 
+    defaultConfig {
+        ndk {
+            abiFilters 'armeabi-v7a'//, 'arm64-v8a'
+        }
+
+        externalNativeBuild {
+            ndkBuild {
+                arguments 'NDK_MODULE_PATH+=../../../../../'
+            }
+        }
+    }
+
+    externalNativeBuild {
+        ndkBuild {
+            path 'jni/Android.mk'
+        }
+    }
+
     aaptOptions {
         noCompress 'zip', 'ogg'
-        ignoreAssetsPattern "!*.dll:*.icf"
+        ignoreAssetsPattern "!*.dll"
     }
 }

examples/Game/part1/proj.android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Feb 03 15:44:28 YEKT 2017
+#Wed Nov 01 12:35:02 YEKT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

examples/Game/part2/proj.android/build-run.bat

@@ -1,4 +1,4 @@
-call ndk-build NDK_MODULE_PATH="../../../../../"
+rem call ndk-build NDK_MODULE_PATH="../../../../"
 call gradlew assembleDebug
-call adb install -r build/outputs/apk/proj.android-debug.apk
+call adb install -r build/outputs/apk/debug/proj.android-debug.apk
 call adb shell am start -n org.oxygine.GamePart2/org.oxygine.GamePart2.MainActivity

examples/Game/part2/proj.android/build-run.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-ndk-build NDK_MODULE_PATH="../../../../../"
+#ndk-build NDK_MODULE_PATH="../../../../"
 gradlew assembleDebug
-adb install -r build/outputs/apk/proj.android-debug.apk
+adb install -r build/outputs/apk/debug/proj.android-debug.apk
 adb shell am start -n org.oxygine.GamePart2/org.oxygine.GamePart2.MainActivity

examples/Game/part2/proj.android/build.gradle

@@ -3,9 +3,10 @@ buildscript {
         mavenLocal()
         mavenCentral()
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.+'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
@@ -14,15 +15,13 @@ apply plugin: 'com.android.application'
 
 
 dependencies {
-    compile(project(':oxygine-extension'))
-    compile(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
+    implementation(project(':oxygine-extension'))
+    implementation(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
 }
 
 android {
-    enforceUniquePackageName=false
         
     compileSdkVersion 23
-    buildToolsVersion '23.0.2'
 
 
     sourceSets {
@@ -35,8 +34,26 @@ android {
         }
     }
 
+    defaultConfig {
+        ndk {
+            abiFilters 'armeabi-v7a'//, 'arm64-v8a'
+        }
+
+        externalNativeBuild {
+            ndkBuild {
+                arguments 'NDK_MODULE_PATH+=../../../../../'
+            }
+        }
+    }
+
+    externalNativeBuild {
+        ndkBuild {
+            path 'jni/Android.mk'
+        }
+    }
+
     aaptOptions {
         noCompress 'zip', 'ogg'
-        ignoreAssetsPattern "!*.dll:*.icf"
+        ignoreAssetsPattern "!*.dll"
     }
 }

examples/Game/part2/proj.android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Feb 03 15:44:28 YEKT 2017
+#Wed Nov 01 12:35:02 YEKT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

examples/Game/part3/proj.android/build-run.bat

@@ -1,4 +1,4 @@
-call ndk-build NDK_MODULE_PATH="../../../../../"
+rem call ndk-build NDK_MODULE_PATH="../../../../"
 call gradlew assembleDebug
-call adb install -r build/outputs/apk/proj.android-debug.apk
+call adb install -r build/outputs/apk/debug/proj.android-debug.apk
 call adb shell am start -n org.oxygine.GamePart3/org.oxygine.GamePart3.MainActivity

examples/Game/part3/proj.android/build-run.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-ndk-build NDK_MODULE_PATH="../../../../../"
+#ndk-build NDK_MODULE_PATH="../../../../"
 gradlew assembleDebug
-adb install -r build/outputs/apk/proj.android-debug.apk
+adb install -r build/outputs/apk/debug/proj.android-debug.apk
 adb shell am start -n org.oxygine.GamePart3/org.oxygine.GamePart3.MainActivity

examples/Game/part3/proj.android/build.gradle

@@ -3,9 +3,10 @@ buildscript {
         mavenLocal()
         mavenCentral()
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.+'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
@@ -14,15 +15,13 @@ apply plugin: 'com.android.application'
 
 
 dependencies {
-    compile(project(':oxygine-extension'))
-    compile(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
+    implementation(project(':oxygine-extension'))
+    implementation(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
 }
 
 android {
-    enforceUniquePackageName=false
         
     compileSdkVersion 23
-    buildToolsVersion '23.0.2'
 
 
     sourceSets {
@@ -35,8 +34,26 @@ android {
         }
     }
 
+    defaultConfig {
+        ndk {
+            abiFilters 'armeabi-v7a'//, 'arm64-v8a'
+        }
+
+        externalNativeBuild {
+            ndkBuild {
+                arguments 'NDK_MODULE_PATH+=../../../../../'
+            }
+        }
+    }
+
+    externalNativeBuild {
+        ndkBuild {
+            path 'jni/Android.mk'
+        }
+    }
+
     aaptOptions {
         noCompress 'zip', 'ogg'
-        ignoreAssetsPattern "!*.dll:*.icf"
+        ignoreAssetsPattern "!*.dll"
     }
 }

examples/Game/part3/proj.android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Feb 03 15:44:28 YEKT 2017
+#Wed Nov 01 12:35:02 YEKT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

examples/Game/part4/proj.android/build-run.bat

@@ -1,4 +1,4 @@
-call ndk-build NDK_MODULE_PATH="../../../../../"
+rem call ndk-build NDK_MODULE_PATH="../../../../"
 call gradlew assembleDebug
-call adb install -r build/outputs/apk/proj.android-debug.apk
+call adb install -r build/outputs/apk/debug/proj.android-debug.apk
 call adb shell am start -n org.oxygine.GamePart4/org.oxygine.GamePart4.MainActivity

examples/Game/part4/proj.android/build-run.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-ndk-build NDK_MODULE_PATH="../../../../../"
+#ndk-build NDK_MODULE_PATH="../../../../"
 gradlew assembleDebug
-adb install -r build/outputs/apk/proj.android-debug.apk
+adb install -r build/outputs/apk/debug/proj.android-debug.apk
 adb shell am start -n org.oxygine.GamePart4/org.oxygine.GamePart4.MainActivity

examples/Game/part4/proj.android/build.gradle

@@ -3,9 +3,10 @@ buildscript {
         mavenLocal()
         mavenCentral()
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.+'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
@@ -14,15 +15,13 @@ apply plugin: 'com.android.application'
 
 
 dependencies {
-    compile(project(':oxygine-extension'))
-    compile(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
+    implementation(project(':oxygine-extension'))
+    implementation(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
 }
 
 android {
-    enforceUniquePackageName=false
         
     compileSdkVersion 23
-    buildToolsVersion '23.0.2'
 
 
     sourceSets {
@@ -35,8 +34,26 @@ android {
         }
     }
 
+    defaultConfig {
+        ndk {
+            abiFilters 'armeabi-v7a'//, 'arm64-v8a'
+        }
+
+        externalNativeBuild {
+            ndkBuild {
+                arguments 'NDK_MODULE_PATH+=../../../../../'
+            }
+        }
+    }
+
+    externalNativeBuild {
+        ndkBuild {
+            path 'jni/Android.mk'
+        }
+    }
+
     aaptOptions {
         noCompress 'zip', 'ogg'
-        ignoreAssetsPattern "!*.dll:*.icf"
+        ignoreAssetsPattern "!*.dll"
     }
 }

examples/Game/part4/proj.android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Feb 03 15:44:28 YEKT 2017
+#Wed Nov 01 12:35:02 YEKT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

examples/Game/part5/proj.android/build-run.bat

@@ -1,4 +1,4 @@
-call ndk-build NDK_MODULE_PATH="../../../../../"
+rem call ndk-build NDK_MODULE_PATH="../../../../"
 call gradlew assembleDebug
-call adb install -r build/outputs/apk/proj.android-debug.apk
+call adb install -r build/outputs/apk/debug/proj.android-debug.apk
 call adb shell am start -n org.oxygine.GamePart5/org.oxygine.GamePart5.MainActivity

examples/Game/part5/proj.android/build-run.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-ndk-build NDK_MODULE_PATH="../../../../../"
+#ndk-build NDK_MODULE_PATH="../../../../"
 gradlew assembleDebug
-adb install -r build/outputs/apk/proj.android-debug.apk
+adb install -r build/outputs/apk/debug/proj.android-debug.apk
 adb shell am start -n org.oxygine.GamePart5/org.oxygine.GamePart5.MainActivity

examples/Game/part5/proj.android/build.gradle

@@ -3,9 +3,10 @@ buildscript {
         mavenLocal()
         mavenCentral()
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.+'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
@@ -14,15 +15,13 @@ apply plugin: 'com.android.application'
 
 
 dependencies {
-    compile(project(':oxygine-extension'))
-    compile(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
+    implementation(project(':oxygine-extension'))
+    implementation(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
 }
 
 android {
-    enforceUniquePackageName=false
         
     compileSdkVersion 23
-    buildToolsVersion '23.0.2'
 
 
     sourceSets {
@@ -35,8 +34,26 @@ android {
         }
     }
 
+    defaultConfig {
+        ndk {
+            abiFilters 'armeabi-v7a'//, 'arm64-v8a'
+        }
+
+        externalNativeBuild {
+            ndkBuild {
+                arguments 'NDK_MODULE_PATH+=../../../../../'
+            }
+        }
+    }
+
+    externalNativeBuild {
+        ndkBuild {
+            path 'jni/Android.mk'
+        }
+    }
+
     aaptOptions {
         noCompress 'zip', 'ogg'
-        ignoreAssetsPattern "!*.dll:*.icf"
+        ignoreAssetsPattern "!*.dll"
     }
 }

examples/Game/part5/proj.android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Feb 03 15:44:28 YEKT 2017
+#Wed Nov 01 12:35:02 YEKT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

examples/HelloWorld/proj.android/build-run.bat

@@ -1,4 +1,4 @@
-call ndk-build NDK_MODULE_PATH="../../../../"
+rem call ndk-build NDK_MODULE_PATH="../../../../"
 call gradlew assembleDebug
-call adb install -r build/outputs/apk/proj.android-debug.apk
+call adb install -r build/outputs/apk/debug/proj.android-debug.apk
 call adb shell am start -n org.oxygine.HelloWorld/org.oxygine.HelloWorld.MainActivity

examples/HelloWorld/proj.android/build-run.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-ndk-build NDK_MODULE_PATH="../../../../"
+#ndk-build NDK_MODULE_PATH="../../../../"
 gradlew assembleDebug
-adb install -r build/outputs/apk/proj.android-debug.apk
+adb install -r build/outputs/apk/debug/proj.android-debug.apk
 adb shell am start -n org.oxygine.HelloWorld/org.oxygine.HelloWorld.MainActivity

examples/HelloWorld/proj.android/build.gradle

@@ -3,9 +3,10 @@ buildscript {
         mavenLocal()
         mavenCentral()
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.+'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
@@ -14,15 +15,13 @@ apply plugin: 'com.android.application'
 
 
 dependencies {
-    compile(project(':oxygine-extension'))
-    compile(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
+    implementation(project(':oxygine-extension'))
+    implementation(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
 }
 
 android {
-    enforceUniquePackageName=false
         
     compileSdkVersion 23
-    buildToolsVersion '23.0.2'
 
 
     sourceSets {
@@ -35,8 +34,26 @@ android {
         }
     }
 
+    defaultConfig {
+        ndk {
+            abiFilters 'armeabi-v7a'//, 'arm64-v8a'
+        }
+
+        externalNativeBuild {
+            ndkBuild {
+                arguments 'NDK_MODULE_PATH+=../../../../'
+            }
+        }
+    }
+
+    externalNativeBuild {
+        ndkBuild {
+            path 'jni/Android.mk'
+        }
+    }
+
     aaptOptions {
         noCompress 'zip', 'ogg'
-        ignoreAssetsPattern "!*.dll:*.icf"
+        ignoreAssetsPattern "!*.dll"
     }
 }

examples/HelloWorld/proj.android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Feb 03 15:44:28 YEKT 2017
+#Wed Nov 01 12:35:02 YEKT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

examples/Match3/proj.android/build-run.bat

@@ -1,4 +1,4 @@
-call ndk-build NDK_MODULE_PATH="../../../../"
+rem call ndk-build NDK_MODULE_PATH="../../../../"
 call gradlew assembleDebug
-call adb install -r build/outputs/apk/proj.android-debug.apk
+call adb install -r build/outputs/apk/debug/proj.android-debug.apk
 call adb shell am start -n org.oxygine.Match3/org.oxygine.Match3.MainActivity

examples/Match3/proj.android/build-run.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-ndk-build NDK_MODULE_PATH="../../../../"
+#ndk-build NDK_MODULE_PATH="../../../../"
 gradlew assembleDebug
-adb install -r build/outputs/apk/proj.android-debug.apk
+adb install -r build/outputs/apk/debug/proj.android-debug.apk
 adb shell am start -n org.oxygine.Match3/org.oxygine.Match3.MainActivity

examples/Match3/proj.android/build.gradle

@@ -3,9 +3,10 @@ buildscript {
         mavenLocal()
         mavenCentral()
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.+'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
@@ -14,15 +15,13 @@ apply plugin: 'com.android.application'
 
 
 dependencies {
-    compile(project(':oxygine-extension'))
-    compile(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
+    implementation(project(':oxygine-extension'))
+    implementation(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
 }
 
 android {
-    enforceUniquePackageName=false
         
     compileSdkVersion 23
-    buildToolsVersion '23.0.2'
 
 
     sourceSets {
@@ -35,8 +34,26 @@ android {
         }
     }
 
+    defaultConfig {
+        ndk {
+            abiFilters 'armeabi-v7a'//, 'arm64-v8a'
+        }
+
+        externalNativeBuild {
+            ndkBuild {
+                arguments 'NDK_MODULE_PATH+=../../../../'
+            }
+        }
+    }
+
+    externalNativeBuild {
+        ndkBuild {
+            path 'jni/Android.mk'
+        }
+    }
+
     aaptOptions {
         noCompress 'zip', 'ogg'
-        ignoreAssetsPattern "!*.dll:*.icf"
+        ignoreAssetsPattern "!*.dll"
     }
 }

examples/Match3/proj.android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Feb 03 15:44:28 YEKT 2017
+#Wed Nov 01 12:35:02 YEKT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

examples/Match3/src/Jewel.cpp

@@ -69,7 +69,7 @@ void Jewel::fall(const Vector2& pos)
 spTween Jewel::swap(const Vector2& pos)
 {
     _swaping = true;
-    spTween tween = _view->addTween(Actor::TweenPosition(pos), 500);
+    spTween tween = _view->addTween(Actor::TweenPosition(pos), 200);
     tween->addDoneCallback(CLOSURE(this, &Jewel::swapped));
     return tween;
 }

examples/Match3/src/example.cpp

@@ -21,11 +21,13 @@ void example_init()
     spSprite bg = new Sprite;
     bg->setResAnim(res.getResAnim("bg"));
     bg->attachTo(getStage());
+    bg->setSize(getStage()->getSize());
 
     board.init(6, 5);
 
     spActor view = board.getView();
-    view->setPosition(getStage()->getSize() / 2 - view->getSize() / 2);
+    view->setScale(getStage()->getHeight()/view->getHeight());
+    view->setPosition(getStage()->getSize() / 2 - view->getScaledSize() / 2);
     getStage()->addChild(view);
 }
 

tools/templates/proj.android/build.gradle

@@ -36,12 +36,12 @@ android {
 
     defaultConfig {
         ndk {
-            abiFilters 'armeabi-v7a', 'arm64-v8a'
+            abiFilters 'armeabi-v7a'//, 'arm64-v8a'
         }
 
         externalNativeBuild {
             ndkBuild {
-                arguments 'NDK_MODULE_PATH+=../../../../'
+                arguments 'NDK_MODULE_PATH+=${ROOT}'
             }
         }
     }

tools/templates/proj.android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Feb 03 15:44:28 YEKT 2017
+#Wed Nov 01 12:35:02 YEKT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip