Skip to content

Commit 11211f8

Browse files
author
Gabor Szanto
committed
Version 1.2.4 B
- Updated Android builds and example projects to Android Studio 3.2 and NDK R18. - Fixed iOS audio I/O bug, not reactivating after app comes foreground.
1 parent bfdd71e commit 11211f8

File tree

64 files changed

+2843
-2310
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+2843
-2310
lines changed

‎Examples_Android/SuperpoweredCrossExample/.idea/caches/build_file_checksums.ser‎

0 Bytes
Binary file not shown.

‎Examples_Android/SuperpoweredCrossExample/app/app.iml‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@
2828
</facet>
2929
</component>
3030
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
31-
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
32-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
31+
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
32+
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
3333
<exclude-output />
3434
<content url="file://$MODULE_DIR$">
3535
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp" isTestSource="false" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r" isTestSource="false" generated="true" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
4141
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
4242
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
4343
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
44-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
4545
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4646
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4747
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
@@ -96,22 +96,28 @@
9696
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
9797
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
9898
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
99+
<excludeFolder url="file://$MODULE_DIR$/.externalNativeBuild" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
101102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
102104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
104106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/cmake" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
105108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
106-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
109+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
110+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
107111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
109-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
112+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
113+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
110114
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
115+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
111116
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
112117
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
118+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
113119
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
114-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
120+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
115121
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
116122
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
117123
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
@@ -120,7 +126,7 @@
120126
<content url="file://$MODULE_DIR$/../../../Superpowered/AndroidIO">
121127
<sourceFolder url="file://$MODULE_DIR$/../../../Superpowered/AndroidIO" isTestSource="false" />
122128
</content>
123-
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
129+
<orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
124130
<orderEntry type="sourceFolder" forTests="false" />
125131
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
126132
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.1" level="project" />

‎Examples_Android/SuperpoweredCrossExample/app/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ apply plugin: 'com.android.application'
33
def superpowered_sdk_path = new File(projectDir, '../../../Superpowered')
44

55
android { // main settings for your application
6-
compileSdkVersion = 27
7-
buildToolsVersion = '27.0.3'
6+
compileSdkVersion = 28
7+
buildToolsVersion = '28.0.2'
88

99
defaultConfig {
1010
applicationId "com.superpowered.crossexample"
1111
minSdkVersion 16 // more than 95% of all active Android devices
12-
targetSdkVersion 27
12+
targetSdkVersion 28
1313
versionCode 1
1414
versionName "1.0"
1515

@@ -19,7 +19,7 @@ android { // main settings for your application
1919

2020
externalNativeBuild {
2121
cmake {
22-
arguments '-DANDROID_PLATFORM=android-16', '-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE', '-DANDROID_STL=gnustl_static', "-DPATH_TO_SUPERPOWERED:STRING=${superpowered_sdk_path}"
22+
arguments '-DANDROID_PLATFORM=android-16', '-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE', '-DANDROID_STL=c++_static', "-DPATH_TO_SUPERPOWERED:STRING=${superpowered_sdk_path}"
2323
cFlags '-O3', '-fsigned-char' // full optimization, char data type is signed
2424
cppFlags '-fsigned-char', "-I${superpowered_sdk_path}"
2525
}

‎Examples_Android/SuperpoweredCrossExample/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
google()
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.1.4'
11+
classpath 'com.android.tools.build:gradle:3.2.0'
1212
}
1313
}
1414

‎Examples_Android/SuperpoweredCrossExample/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 11 11:04:23 CEST 2018
1+
#Tue Sep 25 17:17:13 CEST 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

‎Examples_Android/SuperpoweredEffect/.idea/caches/build_file_checksums.ser‎

0 Bytes
Binary file not shown.

‎Examples_Android/SuperpoweredEffect/.idea/misc.xml‎

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Examples_Android/SuperpoweredEffect/app/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ apply plugin: 'com.android.application'
33
def superpowered_sdk_path = new File(projectDir, '../../../Superpowered')
44

55
android { // main settings for your application
6-
compileSdkVersion = 27
7-
buildToolsVersion = '27.0.3'
6+
compileSdkVersion = 28
7+
buildToolsVersion = '28.0.2'
88

99
defaultConfig {
1010
applicationId "com.superpowered.effect"
1111
minSdkVersion 16
12-
targetSdkVersion 27
12+
targetSdkVersion 28
1313
versionCode 1
1414
versionName "1.0"
1515

@@ -19,7 +19,7 @@ android { // main settings for your application
1919

2020
externalNativeBuild {
2121
cmake {
22-
arguments '-DANDROID_PLATFORM=android-16', '-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE', '-DANDROID_STL=gnustl_static', "-DPATH_TO_SUPERPOWERED:STRING=${superpowered_sdk_path}"
22+
arguments '-DANDROID_PLATFORM=android-16', '-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE', '-DANDROID_STL=c++_static', "-DPATH_TO_SUPERPOWERED:STRING=${superpowered_sdk_path}"
2323
cFlags '-O3', '-fsigned-char' // full optimization, char data type is signed
2424
cppFlags '-fsigned-char', "-I${superpowered_sdk_path}"
2525
}

‎Examples_Android/SuperpoweredEffect/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.1.4'
10+
classpath 'com.android.tools.build:gradle:3.2.0'
1111

1212

1313
// NOTE: Do not place your application dependencies here; they belong

‎Examples_Android/SuperpoweredEffect/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 11 14:07:28 CEST 2018
1+
#Tue Sep 25 17:23:47 CEST 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

0 commit comments

Comments
 (0)