From 77616bef243f6b82b738c3c491b04a9af484bc68 Mon Sep 17 00:00:00 2001 From: Vladislav Khorev Date: Wed, 31 Oct 2018 14:48:08 +0500 Subject: [PATCH] Android version update --- proj.android-studio/.gitignore | 10 ++++ proj.android-studio/app/CMakeLists.txt | 55 +++++++------------ proj.android-studio/app/build.gradle | 19 +++---- .../app/src/main/AndroidManifest.xml | 1 - .../app/src/main/res/layout/prefliste.xml | 4 +- .../app/src/main/res/values-cs/strings.xml | 3 +- .../app/src/main/res/values-de/strings.xml | 4 +- .../app/src/main/res/values-es/strings.xml | 4 +- .../app/src/main/res/values-fr/strings.xml | 4 +- .../app/src/main/res/values-it/strings.xml | 3 +- .../app/src/main/res/values-nl/strings.xml | 2 +- .../app/src/main/res/values-pt/strings.xml | 2 +- .../app/src/main/res/values-ru/strings.xml | 2 +- .../app/src/main/res/values/strings.xml | 3 +- proj.android-studio/build.gradle | 8 ++- .../gradle/wrapper/gradle-wrapper.properties | 12 ++-- proj.android-studio/settings.gradle | 2 +- 17 files changed, 69 insertions(+), 69 deletions(-) create mode 100755 proj.android-studio/.gitignore diff --git a/proj.android-studio/.gitignore b/proj.android-studio/.gitignore new file mode 100755 index 0000000..cea3ef5 --- /dev/null +++ b/proj.android-studio/.gitignore @@ -0,0 +1,10 @@ +*.iml +.gradle +/local.properties +/.idea +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/proj.android-studio/app/CMakeLists.txt b/proj.android-studio/app/CMakeLists.txt index 616d1b1..252d8a7 100755 --- a/proj.android-studio/app/CMakeLists.txt +++ b/proj.android-studio/app/CMakeLists.txt @@ -1,50 +1,35 @@ -# Sets the minimum version of CMake required to build the native -# library. You should either keep the default value or only pass a -# value of 3.4.0 or lower. - cmake_minimum_required(VERSION 3.4.1) -# Creates and names a library, sets it as either STATIC -# or SHARED, and provides the relative paths to its source code. -# You can define multiple libraries, and CMake builds it for you. -# Gradle automatically packages shared libraries with your APK. - - -add_definitions(-DTARGET_ANDROID) - -set(BOOST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../boost_1_63_0) - +set(BOOST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../boost_1_67_0) set(BOOST_GIL_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/boost-gil-extension) - set(ZIP_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/julienr-libzip-android/jni) - set(LIBPNG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/libpng_1.4.1_android) +set(LIBJPEG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/jpeg-9) +set(EIGEN_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../eigen) +set(SOL2_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../sol2) +set(LUA_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/lua-5.3.4/src) -set(LIBJPEG_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/jpeg-9") - - -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../engine) - +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../tes-engine) include_directories(${BOOST_PATH}) +include_directories(${EIGEN_PATH}) +include_directories(${SOL2_PATH}) +include_directories(${LUA_PATH}) include_directories(${LIBPNG_PATH}) include_directories(${LIBJPEG_PATH}) include_directories(${ZIP_PATH}) - include_directories(${BOOST_GIL_PATH}) -add_library( engine - SHARED - IMPORTED ) - -set_target_properties( # Specifies the target library. - engine +add_definitions(-DTARGET_ANDROID) - # Specifies the parameter you want to define. - PROPERTIES IMPORTED_LOCATION +add_library(engine SHARED IMPORTED - # Provides the path to the library you want to import. - ${CMAKE_CURRENT_SOURCE_DIR}/build/intermediates/exploded-aar/proj.android-studio/SalmonEngineAndroid/unspecified/jni/${ANDROID_ABI}/libengine.so ) - + ) + +set_target_properties(engine PROPERTIES IMPORTED_LOCATION + + ${CMAKE_CURRENT_SOURCE_DIR}/../../../tes-engine/SalmonEngineAndroid/app/build/intermediates/cmake/debug/obj/${ANDROID_ABI}/libengine.so + + ) @@ -57,8 +42,8 @@ add_library( # Sets the name of the library. # Provides a relative path to your source file(s). # Associated headers in the same location as their source # file are automatically included. - ${CMAKE_CURRENT_SOURCE_DIR}/../../game/android_api.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../../game/main_code.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/../../jni/android_api.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/../../jni/main_code.cpp ) diff --git a/proj.android-studio/app/build.gradle b/proj.android-studio/app/build.gradle index 22c835e..da141e3 100755 --- a/proj.android-studio/app/build.gradle +++ b/proj.android-studio/app/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 - buildToolsVersion "24.0.1" + compileSdkVersion 28 + buildToolsVersion "28.0.0" defaultConfig { applicationId "fishrungames.mountainwallpaper" - minSdkVersion 15 - targetSdkVersion 24 - versionCode 1 - versionName "1.0" + minSdkVersion 19 + targetSdkVersion 28 + versionCode 2 + versionName "1.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { @@ -36,11 +36,8 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { - exclude group: 'com.android.support', module: 'support-annotations' - }) - compile 'com.android.support:appcompat-v7:24.2.1' - testCompile 'junit:junit:4.12' + + compile 'com.android.support:appcompat-v7:28+' compile project(':SalmonEngineAndroid') } diff --git a/proj.android-studio/app/src/main/AndroidManifest.xml b/proj.android-studio/app/src/main/AndroidManifest.xml index c4cf77e..6062ef6 100755 --- a/proj.android-studio/app/src/main/AndroidManifest.xml +++ b/proj.android-studio/app/src/main/AndroidManifest.xml @@ -20,7 +20,6 @@ android:resource="@xml/wallpaper" /> - \ No newline at end of file diff --git a/proj.android-studio/app/src/main/res/layout/prefliste.xml b/proj.android-studio/app/src/main/res/layout/prefliste.xml index 92fd874..db4d4e5 100755 --- a/proj.android-studio/app/src/main/res/layout/prefliste.xml +++ b/proj.android-studio/app/src/main/res/layout/prefliste.xml @@ -4,7 +4,7 @@ android:orientation="vertical" android:layout_height="fill_parent" android:layout_width="fill_parent"> - - + + diff --git a/proj.android-studio/app/src/main/res/values-cs/strings.xml b/proj.android-studio/app/src/main/res/values-cs/strings.xml index 6a90768..2f6a4e1 100755 --- a/proj.android-studio/app/src/main/res/values-cs/strings.xml +++ b/proj.android-studio/app/src/main/res/values-cs/strings.xml @@ -17,6 +17,7 @@ Přeháňky den Noc - + + Feedback diff --git a/proj.android-studio/app/src/main/res/values-de/strings.xml b/proj.android-studio/app/src/main/res/values-de/strings.xml index 0710fac..402db1c 100755 --- a/proj.android-studio/app/src/main/res/values-de/strings.xml +++ b/proj.android-studio/app/src/main/res/values-de/strings.xml @@ -16,7 +16,7 @@ Bewölkten Day Night - - + + Feedback diff --git a/proj.android-studio/app/src/main/res/values-es/strings.xml b/proj.android-studio/app/src/main/res/values-es/strings.xml index 655713d..13ef81e 100755 --- a/proj.android-studio/app/src/main/res/values-es/strings.xml +++ b/proj.android-studio/app/src/main/res/values-es/strings.xml @@ -17,7 +17,7 @@ Día nublado Noche - - + + Feedback diff --git a/proj.android-studio/app/src/main/res/values-fr/strings.xml b/proj.android-studio/app/src/main/res/values-fr/strings.xml index 72f228d..bd44449 100755 --- a/proj.android-studio/app/src/main/res/values-fr/strings.xml +++ b/proj.android-studio/app/src/main/res/values-fr/strings.xml @@ -16,7 +16,7 @@ Temps nuageux Nuit - - + + Feedback diff --git a/proj.android-studio/app/src/main/res/values-it/strings.xml b/proj.android-studio/app/src/main/res/values-it/strings.xml index 50457f6..13a523f 100755 --- a/proj.android-studio/app/src/main/res/values-it/strings.xml +++ b/proj.android-studio/app/src/main/res/values-it/strings.xml @@ -25,6 +25,7 @@ 1 2 - + + Feedback diff --git a/proj.android-studio/app/src/main/res/values-nl/strings.xml b/proj.android-studio/app/src/main/res/values-nl/strings.xml index 2f86135..123796e 100755 --- a/proj.android-studio/app/src/main/res/values-nl/strings.xml +++ b/proj.android-studio/app/src/main/res/values-nl/strings.xml @@ -16,7 +16,7 @@ Bewolkte dag Nacht - + Feedback diff --git a/proj.android-studio/app/src/main/res/values-pt/strings.xml b/proj.android-studio/app/src/main/res/values-pt/strings.xml index 968486c..f9e6667 100755 --- a/proj.android-studio/app/src/main/res/values-pt/strings.xml +++ b/proj.android-studio/app/src/main/res/values-pt/strings.xml @@ -18,6 +18,6 @@ Noite - + Feedback diff --git a/proj.android-studio/app/src/main/res/values-ru/strings.xml b/proj.android-studio/app/src/main/res/values-ru/strings.xml index eccfb46..47a3a17 100755 --- a/proj.android-studio/app/src/main/res/values-ru/strings.xml +++ b/proj.android-studio/app/src/main/res/values-ru/strings.xml @@ -17,7 +17,7 @@ Облачный день Ночь - + Feedback diff --git a/proj.android-studio/app/src/main/res/values/strings.xml b/proj.android-studio/app/src/main/res/values/strings.xml index 162ccbd..2b443dc 100755 --- a/proj.android-studio/app/src/main/res/values/strings.xml +++ b/proj.android-studio/app/src/main/res/values/strings.xml @@ -38,6 +38,7 @@ 1 2 - + + Feedback diff --git a/proj.android-studio/build.gradle b/proj.android-studio/build.gradle index 74b2ab0..0a832c6 100755 --- a/proj.android-studio/build.gradle +++ b/proj.android-studio/build.gradle @@ -1,20 +1,26 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + ext.kotlin_version = '1.2.70' + repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:3.2.0-rc03' + 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 { jcenter() + google() } } diff --git a/proj.android-studio/gradle/wrapper/gradle-wrapper.properties b/proj.android-studio/gradle/wrapper/gradle-wrapper.properties index 04e285f..8aa3923 100755 --- a/proj.android-studio/gradle/wrapper/gradle-wrapper.properties +++ b/proj.android-studio/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +#Sat Jul 14 10:38:38 YEKT 2018 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/proj.android-studio/settings.gradle b/proj.android-studio/settings.gradle index f82ab8b..7f4686c 100755 --- a/proj.android-studio/settings.gradle +++ b/proj.android-studio/settings.gradle @@ -1,5 +1,5 @@ include ':SalmonEngineAndroid' -project(':SalmonEngineAndroid').projectDir =new File(settingsDir, '../../engine/SalmonEngineAndroid/app') +project(':SalmonEngineAndroid').projectDir =new File(settingsDir, '../../tes-engine/SalmonEngineAndroid/app') include ':app'