Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Beginning the modernisation of the Android build system #2208

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions .bitrise.yml
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,6 @@ blocks/

#ImGui stored settings
imgui.ini
/gradlew
/gradlew.bat
/gradle/
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -8,7 +8,6 @@ if( CINDER_TARGET )
include( "${CMAKE_CURRENT_SOURCE_DIR}/proj/cmake/modules/cinderAndroidToolchain.cmake" )
endif()
endif()

# Project start
project( cinder )

Expand Down
67 changes: 67 additions & 0 deletions bitrise.yml
Original file line number Diff line number Diff line change
@@ -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
26 changes: 26 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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
}
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
android.useAndroidX=true
Binary file not shown.
Binary file removed lib/android/android-19/armeabi-v7a/libboost_system.a
Binary file not shown.
Binary file not shown.
Binary file removed lib/android/android-19/armeabi/libboost_system.a
Binary file not shown.
Binary file removed lib/android/android-19/mips/libboost_filesystem.a
Binary file not shown.
Binary file removed lib/android/android-19/mips/libboost_system.a
Binary file not shown.
Binary file removed lib/android/android-19/x86/libboost_filesystem.a
Binary file not shown.
Binary file removed lib/android/android-19/x86/libboost_system.a
Binary file not shown.
Binary file not shown.
Binary file removed lib/android/android-21/arm64-v8a/libboost_system.a
Binary file not shown.
Binary file not shown.
Binary file removed lib/android/android-21/armeabi-v7a/libboost_system.a
Binary file not shown.
Binary file not shown.
Binary file removed lib/android/android-21/armeabi/libboost_system.a
Binary file not shown.
Binary file removed lib/android/android-21/mips/libboost_filesystem.a
Binary file not shown.
Binary file removed lib/android/android-21/mips/libboost_system.a
Binary file not shown.
Binary file removed lib/android/android-21/mips64/libboost_filesystem.a
Binary file not shown.
Binary file removed lib/android/android-21/mips64/libboost_system.a
Binary file not shown.
Binary file removed lib/android/android-21/x86/libboost_filesystem.a
Binary file not shown.
Binary file removed lib/android/android-21/x86/libboost_system.a
Binary file not shown.
Binary file removed lib/android/android-21/x86_64/libboost_filesystem.a
Binary file not shown.
Binary file removed lib/android/android-21/x86_64/libboost_system.a
Binary file not shown.
Binary file removed lib/android/libcinder-debug.aar
Binary file not shown.
Binary file removed lib/android/libcinder-release.aar
Binary file not shown.
Loading