diff --git a/README.md b/README.md index 8a3b03a..02620fa 100644 --- a/README.md +++ b/README.md @@ -21,12 +21,8 @@ allprojects { 2. Add the dependency in the application build.gradle -[Find the latest AndroidX startup version here](https://developer.android.com/jetpack/androidx/releases/startup) ```gradle dependencies { - // androidX startup for auto-init or find the latest version at the link above - implementation "androidx.startup:startup-runtime:1.0.0" - //crashy implementation 'com.github.FunkyMuse:Crashy:$version' } @@ -36,12 +32,12 @@ dependencies { ```gradle compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = 11 + targetCompatibility = 11 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" } ``` 4. Inside your AndroidManifest.xml file diff --git a/app/build.gradle b/app/build.gradle index 90dfe54..dd63c65 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,27 +27,25 @@ android { } compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = 11 + targetCompatibility = 11 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" } } dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.5.0-beta01' - implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.core:core-ktx:1.7.0-alpha01' + implementation 'androidx.appcompat:appcompat:1.3.1' implementation 'androidx.constraintlayout:constraintlayout:2.0.4' testImplementation "junit:junit:$junitVersion" - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' implementation project(path: ':crashyreporter') - implementation "androidx.startup:startup-runtime:$startup" } \ No newline at end of file diff --git a/build.gradle b/build.gradle index c3c6918..2f6d304 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ buildscript { - ext.kotlin_version = "1.4.30" + ext.kotlin_version = "1.5.21" repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.2' + classpath 'com.android.tools.build:gradle:7.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -25,8 +25,8 @@ ext { //tests junitVersion = '4.13.2' hamcrestVersion = '1.3' - androidXTestCoreVersion = '1.3.0' - androidXTestExtKotlinRunnerVersion = '1.1.2' + androidXTestCoreVersion = '1.4.0' + androidXTestExtKotlinRunnerVersion = '1.1.3' androidXTestRulesVersion = '1.2.0-beta01' robolectricVersion = '4.4' archTestingVersion = '2.1.0' diff --git a/crashyreporter/build.gradle b/crashyreporter/build.gradle index c43efeb..4b1563e 100644 --- a/crashyreporter/build.gradle +++ b/crashyreporter/build.gradle @@ -7,8 +7,6 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 30 - versionCode 1 - versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" @@ -26,25 +24,24 @@ android { } compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = 11 + targetCompatibility = 11 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" } } dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.3.2' + implementation 'androidx.core:core-ktx:1.6.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' - implementation "androidx.startup:startup-runtime:$startup" + api "androidx.startup:startup-runtime:$startup" // Dependencies for local unit tests diff --git a/crashyreporter/src/main/java/com/crazylegend/crashyreporter/utils/DeviceUtils.kt b/crashyreporter/src/main/java/com/crazylegend/crashyreporter/utils/DeviceUtils.kt index 22e1a0d..e2d968f 100644 --- a/crashyreporter/src/main/java/com/crazylegend/crashyreporter/utils/DeviceUtils.kt +++ b/crashyreporter/src/main/java/com/crazylegend/crashyreporter/utils/DeviceUtils.kt @@ -125,6 +125,7 @@ internal object DeviceUtils { null } + @SuppressLint("HardwareIds") private fun getDeviceID(context: Context): String? = Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID) private fun getAppVersion(context: Context) = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { context.packageManager.getPackageInfo(context.packageName, 0).longVersionCode diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04cb4c8..9b49369 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip