Skip to content

Commit

Permalink
Update third party libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
kairusds committed Oct 16, 2021
1 parent c7297af commit 75562c6
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 29 deletions.
19 changes: 3 additions & 16 deletions AndEngine/build.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,11 @@
buildscript {
repositories {
mavenCentral()
jcenter()
google()
}

dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
}
}

apply plugin: 'com.android.library'

android {
compileSdkVersion 29
buildToolsVersion '28.0.3'
compileSdkVersion 30

defaultConfig {
minSdkVersion 14
targetSdkVersion 23
minSdkVersion 21
targetSdkVersion 29
versionCode 1
versionName '1.0'
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ public void onWindowFocusChanged(final boolean pHasWindowFocus) {
}
this.mHasWindowFocused = true;
} else {
if(!this.mPaused) {
/* if(!this.mPaused) {
this.doPause();
}
} */
this.mHasWindowFocused = false;
}
}
Expand Down
13 changes: 13 additions & 0 deletions AndEngine/src/org/anddev/andengine/util/Debug.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.anddev.andengine.util;

import org.anddev.andengine.BuildConfig;
import org.anddev.andengine.util.constants.Constants;

import android.util.Log;
Expand Down Expand Up @@ -59,44 +60,53 @@ public static void setDebugLevel(final DebugLevel pDebugLevel) {
// ===========================================================

public static void v(final String pMessage) {
if(!BuildConfig.DEBUG) return;
Debug.v(pMessage, null);
}

public static void v(final String pMessage, final Throwable pThrowable) {
if(!BuildConfig.DEBUG) return;
if(sDebugLevel.isSameOrLessThan(DebugLevel.VERBOSE)) {
Log.v(sDebugTag, pMessage, pThrowable);
}
}

public static void d(final String pMessage) {
if(!BuildConfig.DEBUG) return;
Debug.d(pMessage, null);
}

public static void d(final String pMessage, final Throwable pThrowable) {
if(!BuildConfig.DEBUG) return;
if(sDebugLevel.isSameOrLessThan(DebugLevel.DEBUG)) {
Log.d(sDebugTag, pMessage, pThrowable);
}
}

public static void i(final String pMessage) {
if(!BuildConfig.DEBUG) return;
Debug.i(pMessage, null);
}

public static void i(final String pMessage, final Throwable pThrowable) {
if(!BuildConfig.DEBUG) return;
if(sDebugLevel.isSameOrLessThan(DebugLevel.INFO)) {
Log.i(sDebugTag, pMessage, pThrowable);
}
}

public static void w(final String pMessage) {
if(!BuildConfig.DEBUG) return;
Debug.w(pMessage, null);
}

public static void w(final Throwable pThrowable) {
if(!BuildConfig.DEBUG) return;
Debug.w("", pThrowable);
}

public static void w(final String pMessage, final Throwable pThrowable) {
if(!BuildConfig.DEBUG) return;
if(sDebugLevel.isSameOrLessThan(DebugLevel.WARNING)) {
if(pThrowable == null) {
Log.w(sDebugTag, pMessage, new Exception());
Expand All @@ -107,14 +117,17 @@ public static void w(final String pMessage, final Throwable pThrowable) {
}

public static void e(final String pMessage) {
if(!BuildConfig.DEBUG) return;
Debug.e(pMessage, null);
}

public static void e(final Throwable pThrowable) {
if(!BuildConfig.DEBUG) return;
Debug.e(sDebugTag, pThrowable);
}

public static void e(final String pMessage, final Throwable pThrowable) {
if(!BuildConfig.DEBUG) return;
if(sDebugLevel.isSameOrLessThan(DebugLevel.ERROR)) {
if(pThrowable == null) {
Log.e(sDebugTag, pMessage, new Exception());
Expand Down
15 changes: 10 additions & 5 deletions LibBASS/build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 29


compileSdkVersion 30
ndkVersion '22.1.7171670'

defaultConfig {
minSdkVersion 14
targetSdkVersion 27
minSdkVersion 21
targetSdkVersion 29
versionCode 1
versionName "1.0"
}

lintOptions {
abortOnError true
ignoreWarnings true
disable 'ExpiredTargetSdkVersion'
}

buildTypes {
release {
minifyEnabled false
Expand Down
2 changes: 1 addition & 1 deletion LibBASS/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.un4seen.bass" />
package="com.un4seen.bass" />
2 changes: 1 addition & 1 deletion LibBASS/src/main/java/com/un4seen/bass/BASS.java
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,7 @@ public static class FloatValue {
public static native int BASS_SampleGetChannels(int handle, int[] channels);
public static native boolean BASS_SampleStop(int handle);

public static native int BASS_StreamCreate(int freq, int chans, int flags, STREAMPROC proc, Object user);
public static native int BASS_StreamCreateFile(String file, long offset, long length, int flags);
public static native int BASS_StreamCreateFile(ByteBuffer file, long offset, long length, int flags);
public static native int BASS_StreamCreateFile(ParcelFileDescriptor file, long offset, long length, int flags);
Expand Down Expand Up @@ -773,7 +774,6 @@ public static class FloatValue {
public static native boolean BASS_FXReset(int handle);

static native int BASS_StreamCreateConst(int freq, int chans, int flags, int proc, Object user);
public static native int BASS_StreamCreate(int freq, int chans, int flags, STREAMPROC proc, Object user);
public static int BASS_StreamCreate(int freq, int chans, int flags, int proc, Object user) {
return BASS_StreamCreateConst(freq, chans, flags, proc, user);
}
Expand Down
Binary file modified LibBASS/src/main/jniLibs/arm64-v8a/libbass.so
Binary file not shown.
Binary file modified LibBASS/src/main/jniLibs/armeabi-v7a/libbass.so
Binary file not shown.
Binary file modified LibBASS/src/main/jniLibs/x86/libbass.so
Binary file not shown.
Binary file modified LibBASS/src/main/jniLibs/x86_64/libbass.so
Binary file not shown.
Binary file added LibBASS/src/main/jniLibs/x86_64/libbass_fx.so
Binary file not shown.
7 changes: 3 additions & 4 deletions andnext_markdown/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 29
buildToolsVersion "28.0.3"
compileSdkVersion 30

defaultConfig {
minSdkVersion 14
targetSdkVersion 24
minSdkVersion 21
targetSdkVersion 29
versionCode 1
versionName "1.0"
}
Expand Down

0 comments on commit 75562c6

Please sign in to comment.