Skip to content

Commit

Permalink
Merge pull request #200 from hannesa2/Api31
Browse files Browse the repository at this point in the history
Api31
  • Loading branch information
hannesa2 authored Sep 11, 2021
2 parents 204b304 + c0ed02e commit f99fc12
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion basicSample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ android {
defaultConfig {
applicationId "info.mqtt.java.example"
minSdkVersion 21
targetSdkVersion 30
targetSdkVersion 31
versionCode getGitCommitCount()
versionName getTag()

Expand Down
3 changes: 2 additions & 1 deletion basicSample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
<activity
android:name="info.mqtt.java.example.MQTTExampleActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
android:theme="@style/AppTheme.NoActionBar"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ buildscript {
println "Gradle uses Java ${Jvm.current()}"

ext {
compileSdkVersion = 30
compileSdkVersion = 31
room_version = "2.4.0-alpha04"
}

Expand Down
2 changes: 1 addition & 1 deletion extendedSample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {
defaultConfig {
applicationId 'info.mqtt.android.extsample'
minSdkVersion 21
targetSdkVersion 30
targetSdkVersion 31
versionCode getGitCommitCount()
versionName getTag()

Expand Down
3 changes: 2 additions & 1 deletion extendedSample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@

<activity
android:name="info.mqtt.android.extsample.MainActivity"
android:label="@string/app_name">
android:label="@string/app_name"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
2 changes: 1 addition & 1 deletion serviceLibrary/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {

defaultConfig {
minSdkVersion 21
targetSdkVersion 30
targetSdkVersion 31

versionCode getGitCommitCount()
// Android Studio 4.1 doesn't generate versionName in libraries any more
Expand Down

0 comments on commit f99fc12

Please sign in to comment.