Skip to content

Commit

Permalink
Merge pull request #308 from geeksville/dev
Browse files Browse the repository at this point in the history
1.2.50
  • Loading branch information
geeksville authored Nov 17, 2021
2 parents 1ef4128 + 57e1c48 commit e4c5664
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 13 deletions.
17 changes: 17 additions & 0 deletions .idea/deploymentTargetDropDown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ android {
keyPassword "$meshtasticKeyPassword"
}
} */
compileSdkVersion 30
compileSdkVersion 31
// leave undefined to use version plugin wants
// buildToolsVersion "30.0.2" // Note: 30.0.2 doesn't yet work on Github actions CI
defaultConfig {
applicationId "com.geeksville.mesh"
minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
targetSdkVersion 30 // 30 can't work until an explicit location permissions dialog is added
versionCode 20245 // format is Mmmss (where M is 1+the numeric major number
versionName "1.2.45"
versionCode 20250 // format is Mmmss (where M is 1+the numeric major number
versionName "1.2.50"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

// per https://developer.android.com/studio/write/vector-asset-studio
Expand Down Expand Up @@ -117,15 +117,15 @@ dependencies {

implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.core:core-ktx:1.6.0'
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.fragment:fragment-ktx:1.3.6'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.viewpager2:viewpager2:1.0.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.0'
implementation "androidx.room:room-runtime:$room_version"
kapt "androidx.room:room-compiler:$room_version"

Expand Down Expand Up @@ -169,7 +169,7 @@ dependencies {
implementation 'com.google.android.gms:play-services-auth:19.2.0'

// Add the Firebase SDK for Crashlytics.
implementation 'com.google.firebase:firebase-crashlytics:18.2.0'
implementation 'com.google.firebase:firebase-crashlytics:18.2.4'

// alas implementation bug deep in the bowels when I tried it for my SyncBluetoothDevice class
// implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3"
Expand All @@ -182,7 +182,7 @@ dependencies {
implementation('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false }
implementation 'com.google.zxing:core:3.4.1'

def work_version = '2.5.0'
def work_version = '2.7.0'

// Work Request - used to delay boot event handling
// implementation "androidx.work:work-runtime:$work_version"
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.5.30'
ext.coroutines_version = "1.5.1"
ext.kotlin_version = '1.6.0'
ext.coroutines_version = "1.5.2"

repositories {
google()
// jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.1'
classpath 'com.android.tools.build:gradle:7.0.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"

Expand All @@ -21,7 +21,7 @@ buildscript {
// Check that you have the Google Services Gradle plugin v4.3.2 or later
// (if not, add it).
classpath 'com.google.gms:google-services:4.3.10'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.0'

// protobuf plugin - docs here https://github.com/google/protobuf-gradle-plugin
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.15'
Expand Down
2 changes: 1 addition & 1 deletion geeksville-androidlib

0 comments on commit e4c5664

Please sign in to comment.