cinder · alias-r-cummins · Mar 1, 2020 · Aug 6, 2020 · Aug 6, 2020 · Aug 15, 2020
diff --git a/.bitrise.yml b/.bitrise.yml
@@ -0,0 +1,40 @@
+---
+format_version: '8'
+default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
+project_type: macos
+trigger_map:
+  - push_branch: "*"
+    workflow: primary
+  - pull_request_source_branch: "*"
+    workflow: primary
+workflows:
+  primary:
+    steps:
+      - activate-ssh-key@4:
+          run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'
+      - git-clone@4: {}
+      - cache-pull@2: {}
+      - script@1:
+          title: Do anything with Script step
+      - certificate-and-profile-installer@1: {}
+      - recreate-user-schemes@1:
+          inputs:
+            - project_path: "$BITRISE_PROJECT_PATH"
+      - xcode-archive-mac@1:
+          inputs:
+            - project_path: "$BITRISE_PROJECT_PATH"
+            - scheme: "$BITRISE_SCHEME"
+            - export_method: "$BITRISE_EXPORT_METHOD"
+      - deploy-to-bitrise-io@1: {}
+      - cache-push@2: {}
+app:
+  envs:
+    - opts:
+        is_expand: false
+      BITRISE_PROJECT_PATH: test/AppTest/xcode/AppTest.xcodeproj
+    - opts:
+        is_expand: false
+      BITRISE_SCHEME: AppTest
+    - opts:
+        is_expand: false
+      BITRISE_EXPORT_METHOD: app-store
diff --git a/.gitignore b/.gitignore
@@ -73,3 +73,6 @@ blocks/
 
 #ImGui stored settings
 imgui.ini
+/gradlew
+/gradlew.bat
+/gradle/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required( VERSION 3.10 FATAL_ERROR )
+cmake_minimum_required( VERSION 3.10.2 FATAL_ERROR )
 set( CMAKE_VERBOSE_MAKEFILE ON )
 
 # Configure the Android toolchain before the project start
@@ -8,7 +8,6 @@ if( CINDER_TARGET )
 	    include( "${CMAKE_CURRENT_SOURCE_DIR}/proj/cmake/modules/cinderAndroidToolchain.cmake" )
     endif()
 endif()
-
 # Project start
 project( cinder )
 

diff --git a/bitrise.yml b/bitrise.yml
@@ -0,0 +1,67 @@
+---
+format_version: '8'
+default_step_lib_source: 'https://github.com/bitrise-io/bitrise-steplib.git'
+project_type: macos
+trigger_map:
+  - push_branch: '*'
+    workflow: primary
+  - pull_request_source_branch: '*'
+    workflow: primary
+workflows:
+  deploy:
+    steps:
+      - activate-ssh-key@4:
+          run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'
+      - git-clone@4: {}
+      - cache-pull@2: {}
+      - script@1:
+          title: Do anything with Script step
+      - certificate-and-profile-installer@1: {}
+      - recreate-user-schemes@1:
+          inputs:
+            - project_path: $BITRISE_PROJECT_PATH
+      - cocoapods-install@1: {}
+      - xcode-test-mac@1:
+          inputs:
+            - project_path: $BITRISE_PROJECT_PATH
+            - scheme: $BITRISE_SCHEME
+      - xcode-archive-mac@1:
+          inputs:
+            - project_path: $BITRISE_PROJECT_PATH
+            - scheme: $BITRISE_SCHEME
+            - export_method: $BITRISE_EXPORT_METHOD
+      - deploy-to-bitrise-io@1: {}
+      - cache-push@2: {}
+  primary:
+    steps:
+      - activate-ssh-key@4:
+          run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'
+      - git-clone@4: {}
+      - cache-pull@2: {}
+      - script@1:
+          title: Do anything with Script step
+          inputs:
+            - script_file_path: proj/xcode/fullbuild.sh
+            - is_debug: 'yes'
+      - certificate-and-profile-installer@1: {}
+      - recreate-user-schemes@1:
+          inputs:
+            - project_path: $BITRISE_PROJECT_PATH
+      - cocoapods-install@1: {}
+      - xcode-test-mac@1:
+          inputs:
+            - project_path: $BITRISE_PROJECT_PATH
+            - scheme: $BITRISE_SCHEME
+      - deploy-to-bitrise-io@1: {}
+      - cache-push@2: {}
+app:
+  envs:
+    - opts:
+        is_expand: false
+      BITRISE_PROJECT_PATH: proj/xcode/cinder.xcodeproj
+    - opts:
+        is_expand: false
+      BITRISE_SCHEME: MacOS X
+    - opts:
+        is_expand: false
+      BITRISE_EXPORT_METHOD: development
diff --git a/build.gradle b/build.gradle
@@ -0,0 +1,26 @@
+//top level gradle build file for Cinder Android API 26, NDK 21
+buildscript {
+    ext.kotlin_version = "1.3.72"
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:4.0.1"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1 @@
+android.useAndroidX=true
diff --git a/lib/android/android-19/armeabi-v7a/libboost_filesystem.a b/lib/android/android-19/armeabi-v7a/libboost_filesystem.a
diff --git a/lib/android/android-19/armeabi-v7a/libboost_system.a b/lib/android/android-19/armeabi-v7a/libboost_system.a
diff --git a/lib/android/android-19/armeabi/libboost_filesystem.a b/lib/android/android-19/armeabi/libboost_filesystem.a
diff --git a/lib/android/android-19/armeabi/libboost_system.a b/lib/android/android-19/armeabi/libboost_system.a
diff --git a/lib/android/android-19/mips/libboost_filesystem.a b/lib/android/android-19/mips/libboost_filesystem.a
diff --git a/lib/android/android-19/mips/libboost_system.a b/lib/android/android-19/mips/libboost_system.a
diff --git a/lib/android/android-19/x86/libboost_filesystem.a b/lib/android/android-19/x86/libboost_filesystem.a
diff --git a/lib/android/android-19/x86/libboost_system.a b/lib/android/android-19/x86/libboost_system.a
diff --git a/lib/android/android-21/arm64-v8a/libboost_filesystem.a b/lib/android/android-21/arm64-v8a/libboost_filesystem.a
diff --git a/lib/android/android-21/arm64-v8a/libboost_system.a b/lib/android/android-21/arm64-v8a/libboost_system.a
diff --git a/lib/android/android-21/armeabi-v7a/libboost_filesystem.a b/lib/android/android-21/armeabi-v7a/libboost_filesystem.a
diff --git a/lib/android/android-21/armeabi-v7a/libboost_system.a b/lib/android/android-21/armeabi-v7a/libboost_system.a
diff --git a/lib/android/android-21/armeabi/libboost_filesystem.a b/lib/android/android-21/armeabi/libboost_filesystem.a
diff --git a/lib/android/android-21/armeabi/libboost_system.a b/lib/android/android-21/armeabi/libboost_system.a
diff --git a/lib/android/android-21/mips/libboost_filesystem.a b/lib/android/android-21/mips/libboost_filesystem.a
diff --git a/lib/android/android-21/mips/libboost_system.a b/lib/android/android-21/mips/libboost_system.a
diff --git a/lib/android/android-21/mips64/libboost_filesystem.a b/lib/android/android-21/mips64/libboost_filesystem.a
diff --git a/lib/android/android-21/mips64/libboost_system.a b/lib/android/android-21/mips64/libboost_system.a
diff --git a/lib/android/android-21/x86/libboost_filesystem.a b/lib/android/android-21/x86/libboost_filesystem.a
diff --git a/lib/android/android-21/x86/libboost_system.a b/lib/android/android-21/x86/libboost_system.a
diff --git a/lib/android/android-21/x86_64/libboost_filesystem.a b/lib/android/android-21/x86_64/libboost_filesystem.a
diff --git a/lib/android/android-21/x86_64/libboost_system.a b/lib/android/android-21/x86_64/libboost_system.a
diff --git a/lib/android/libcinder-debug.aar b/lib/android/libcinder-debug.aar
diff --git a/lib/android/libcinder-release.aar b/lib/android/libcinder-release.aar