Skip to content

Commit

Permalink
Update android gradle tools to 3.2.1 for Qt 5.12.3 / NDK17+
Browse files Browse the repository at this point in the history
  • Loading branch information
felgoba committed May 22, 2019
1 parent b8829b3 commit 9df61cf
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 13 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ qrc_*.cpp
ui_*.h
Makefile*
*-build-*
build-*

# QtCreator

Expand Down
17 changes: 14 additions & 3 deletions QtWS.pro
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@ CONFIG += felgo

CONFIG += qzxing_multimedia # multimedia + QML features for QZXing

# Project identifier and version
# More information: https://felgo.com/doc/felgo-publishing/#project-configuration
PRODUCT_IDENTIFIER = net.vplay.demos.qtws2017
PRODUCT_VERSION_NAME = 1.3
PRODUCT_VERSION_CODE = 26

# Optionally set a license key that is used instead of the license key from
# main.qml file (App::licenseKey for your app or GameWindow::licenseKey for your game)
# Only used for local builds and Felgo Cloud Builds (https://felgo.com/cloud-builds)
# Not used if using Felgo Live
PRODUCT_LICENSE_KEY = ""

# add QZXing framework for barcode scanning
include(QZXing/QZXing.pri)

Expand Down Expand Up @@ -46,12 +58,11 @@ android {
android/build.gradle
}

# Uncomment for using iOS plugin libraries
# FELGO_PLUGINS += onesignal facebook amplitude
ios {
QMAKE_INFO_PLIST = ios/Project-Info.plist
OTHER_FILES += $$QMAKE_INFO_PLIST

# Uncomment for using iOS plugin libraries
# FELGO_PLUGINS += onesignal facebook amplitude
}

# set application icons for win and macx
Expand Down
13 changes: 10 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
buildscript {
repositories {
maven { url 'https://maven.google.com' }
jcenter()
}

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

Expand All @@ -20,10 +21,12 @@ apply plugin: 'com.android.application'

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])

compile 'net.vplay.plugins:plugin-onesignal:3.+' // one signal plugin
compile 'net.vplay.plugins:plugin-notification:3.+' // local notifications
compile 'net.vplay.plugins:plugin-facebook:3.+' // facebook plugin
compile 'net.vplay.plugins:plugin-amplitude:3.+' // amplitude plugin

}

android {
Expand All @@ -41,10 +44,13 @@ android {
*******************************************************/

compileSdkVersion androidCompileSdkVersion.toInteger()

buildToolsVersion androidBuildToolsVersion

defaultConfig.applicationId = "net.vplay.demos.qtws2017"
defaultConfig {
applicationId = productIdentifier
versionCode = productVersionCode.toInteger()
versionName = productVersionName
}

sourceSets {
main {
Expand All @@ -63,3 +69,4 @@ android {
abortOnError false
}
}

6 changes: 0 additions & 6 deletions android/gradle/wrapper/gradle-wrapper.properties

This file was deleted.

2 changes: 1 addition & 1 deletion ios/Project-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<string>Icon@2x.png</string>
</array>
<key>CFBundleIdentifier</key>
<string>net.vplay.demos.qtws2017</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
Expand Down

0 comments on commit 9df61cf

Please sign in to comment.