Skip to content

Commit

Permalink
Release 2403.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Release Pipeline committed Feb 29, 2024
1 parent 76ba007 commit 166ebff
Show file tree
Hide file tree
Showing 304 changed files with 17,161 additions and 3,088 deletions.
9 changes: 9 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

###############################################################################
# Don't add crlf to Linux bash files or they get Bash: /bin/bash^M: bad interpreter errors
###############################################################################
*.bash text eol=lf
26 changes: 26 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
*.user
*.userosscache
*.sln.docstates
.vscode
target/
Int/

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
Expand Down Expand Up @@ -339,3 +341,27 @@ reports/
# Used in template-update-check.yml
git_diff_output.txt
gen.txt

# Android build files
.cxx/
.gradle/
local.properties
/Build/PlayFabServices.Android.Workspace/build
/Out/
/Test/PlayFabServicesTestApp/Android/app/build
/Test/PlayFabServicesTestApp/Android/app/libs
/Test/PlayFabServicesTestApp/Android/app/src/main/assets

#XCode
.DS_Store
*.swp
*~.nib
*.pbxuser
*.perspective
*.perspectivev3

xcuserdata

# PlayFab test app logs
**/PFTestAppEventsLog.txt
**/PFTestAppSummary.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
</plist>
6 changes: 0 additions & 6 deletions Build/PlayFab.C.GDK.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@

<Import Condition="'$(PlayFabPathsImported)' != 'true'" Project="PlayFab.C.paths.props" />

<!--We have to explicitly exclude GDK extension libraries because XSAPI and LHC will be pulled in by default, conflicting -->
<!--with the LHC lib built from source.-->
<PropertyGroup>
<GDKExtLibNames>;</GDKExtLibNames>
</PropertyGroup>

<!--Use same build config as LHC-->
<Import Project="$(HCBuildRoot)\libHttpClient.GDK.props" />

Expand Down
93 changes: 93 additions & 0 deletions Build/PlayFabCore.Android/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
cmake_minimum_required(VERSION 3.6)

get_filename_component(PATH_TO_ROOT "../../" ABSOLUTE)
get_filename_component(PATH_TO_SOURCE "../../Source" ABSOLUTE)

set(PATH_TO_LHC ../libHttpClient)
if(NOT EXISTS "${PATH_TO_LHC}/README.md")
set(PATH_TO_LHC ${PATH_TO_ROOT}/../libHttpClient)
endif()

project("PlayFabCore.Android")

set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-z,now")
set(CMAKE_CXX_FLAGS_RELEASE "-gdwarf-5")
set(CMAKE_C_FLAGS_RELEASE "-gdwarf-5")

###########################################
### Set up paths for source and include ###
###########################################

include("../PlayFabCore.CMake/GetCommonSourceFiles.cmake")
get_common_source_files(
COMMON_SOURCE_FILES
"${PATH_TO_SOURCE}"
)

include("../PlayFabCore.CMake/GetServiceWrapperFiles.cmake")
get_service_wrapper_source_files(
SERVICE_WRAPPER_SOURCE_FILES
"${PATH_TO_SOURCE}"
)

set(COMMON_INCLUDE_DIRS
"${PATH_TO_SOURCE}/PlayFabCore/Source"
"${PATH_TO_SOURCE}/PlayFabCore/Source/Common"
"${PATH_TO_SOURCE}/PlayFabCore/Include"
"${PATH_TO_SOURCE}/PlayFabCore/Include/Generated"
"${PATH_TO_SOURCE}/PlayFabSharedInternal/Include"
"${PATH_TO_SOURCE}/PlayFabSharedInternal/Include/Generated"
"${PATH_TO_ROOT}/External/rapidjson/include"
"${PATH_TO_LHC}/Include"
)

#########################
### Set up shared lib ###
#########################

add_subdirectory("../PlayFabSharedInternal.Android" ${PATH_TO_ROOT}/Out/Android/PlayFabCore.Android/PlayFabSharedInternal/${CMAKE_BUILD_TYPE}/${ANDROID_ABI})

string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
add_subdirectory("${PATH_TO_LHC}/Build/libHttpClient.Android" "${PATH_TO_LHC}/Binaries/Android/.cxx/libHttpClient.Android/cmake/${CMAKE_BUILD_TYPE_LOWER}/${ANDROID_ABI}")

add_library(
"PlayFabCore.Android"
SHARED
"${SERVICE_WRAPPER_SOURCE_FILES}"
"${COMMON_SOURCE_FILES}"
)

target_include_directories(
"PlayFabCore.Android"
PRIVATE
"${COMMON_INCLUDE_DIRS}"
)

find_library( # Sets the name of the path variable.
log-lib

# Specifies the name of the NDK library that
# you want CMake to locate.
log
)

target_link_libraries(
PlayFabCore.Android
PlayFabSharedInternal.Android
libHttpClient.Android
${log-lib}
)

include("../PlayFabSharedInternal.CMake/GetLinuxFlags.cmake")
get_linux_flags(FLAGS FLAGS_DEBUG FLAGS_RELEASE)

include("../PlayFabSharedInternal.CMake/TargetSetFlags.cmake")
target_set_flags(
"PlayFabCore.Android"
"${FLAGS}"
"${FLAGS_DEBUG}"
"${FLAGS_RELEASE}"
)
73 changes: 73 additions & 0 deletions Build/PlayFabCore.Android/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
apply plugin: "com.android.library"

android {
compileSdk 34
ndkVersion "25.1.8937393"

defaultConfig {
targetSdkVersion 34
minSdkVersion 21

externalNativeBuild {
cmake {
// externalNativeBuild normally skips static
// lib targets. This forces it to build.
targets "PlayFabCore.Android"
arguments "-DANDROID_TOOLCHAIN=clang++"
}
}
}

externalNativeBuild {
cmake {
version "3.18.1"
path "CMakeLists.txt"
buildStagingDirectory "${project.buildDir.getParentFile().getAbsolutePath()}/.cxx/${project.name}"
}
}

flavorDimensions "ABI"

productFlavors {
full {
dimension "ABI"
externalNativeBuild {
cmake {
abiFilters "arm64-v8a", "x86_64"
}
}
}
arm8 {
dimension "ABI"
externalNativeBuild {
cmake {
abiFilters "arm64-v8a"
}
}
}
x86_64 {
dimension "ABI"
externalNativeBuild {
cmake {
abiFilters "x86_64"
}
}
}
}

compileOptions {
sourceCompatibility=JavaVersion.VERSION_1_8
targetCompatibility=JavaVersion.VERSION_1_8
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile("proguard-android.txt")
}
}
}

// Put all the Gradle build files under the /Out directory
def binariesDir = project.file("../../Out/Android/${project.name}").getAbsolutePath()
project.buildDir(new File(binariesDir))
8 changes: 8 additions & 0 deletions Build/PlayFabCore.Android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.microsoft.playfab.core"
android:versionCode="1"
android:versionName="1.0">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
</manifest>
Loading

0 comments on commit 166ebff

Please sign in to comment.