From 408778fb8f91b04335fc3452de1729dd83bfede1 Mon Sep 17 00:00:00 2001 From: Martin Felis Date: Sat, 31 Mar 2018 19:48:40 +0200 Subject: [PATCH] Minor adjustments for 0.11.0-alpha1 --- app/build.gradle | 6 +++--- app/src/main/AndroidManifest.xml | 10 +--------- build.gradle | 5 +++++ love/src/jni/love/src/modules/graphics/Texture.cpp | 9 --------- 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b819ac12..19e26df6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,14 +5,14 @@ android { buildToolsVersion "26.0.2" defaultConfig { applicationId "org.love2d.android" - versionCode 22 - versionName "0.10.2" + versionCode 23 + versionName "0.11.0-alpha1" minSdkVersion 10 targetSdkVersion 25 } buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dee04a95..869163d2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -30,13 +30,7 @@ - - - - - - - + @@ -52,12 +46,10 @@ diff --git a/build.gradle b/build.gradle index de2eee4d..a015c70d 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,7 @@ buildscript { repositories { jcenter() + google() } dependencies { classpath 'com.android.tools.build:gradle:3.0.1' @@ -15,3 +16,7 @@ buildscript { task clean(type: Delete) { delete rootProject.buildDir } + +repositories { + google() +} \ No newline at end of file diff --git a/love/src/jni/love/src/modules/graphics/Texture.cpp b/love/src/jni/love/src/modules/graphics/Texture.cpp index 70469551..59bc5031 100644 --- a/love/src/jni/love/src/modules/graphics/Texture.cpp +++ b/love/src/jni/love/src/modules/graphics/Texture.cpp @@ -27,15 +27,6 @@ #include #include -#ifdef LOVE_ANDROID -// log2 is not declared in the math.h shipped with the Android NDK -static inline double log2(double n) -{ - // log(n)/log(2) is log2. - return std::log(n) / std::log(2); -} -#endif - namespace love {