Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates #485

Merged
merged 14 commits into from
Aug 6, 2024
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: set up JDK
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
- name: Decode google-services.json
env:
FIREBASE_CONFIG: ${{ secrets.FIREBASE_CONFIG }}
Expand Down
48 changes: 25 additions & 23 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.1.2'
classpath 'com.google.gms:google-services:4.3.10'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
classpath 'com.android.tools.build:gradle:8.2.2'
classpath 'com.google.gms:google-services:4.4.2'
classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'
}
}

Expand All @@ -23,13 +23,13 @@ allprojects {
}

android {
compileSdkVersion 32
flavorDimensions "tier"

defaultConfig {
compileSdk 34
applicationId "bbct.android.common"
minSdkVersion 21
targetSdkVersion 32
minSdk 21
targetSdk 34
versionCode 24
versionName "1.1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -41,8 +41,8 @@ android {
multiDexEnabled true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
signingConfigs {
release
Expand All @@ -69,12 +69,15 @@ android {
}
}
packagingOptions {
exclude 'LICENSE.txt'
resources {
excludes += ['LICENSE.txt']
}
}

useLibrary 'android.test.runner'
useLibrary 'android.test.base'
useLibrary 'android.test.mock'
namespace 'bbct.android.common'
}

Properties props = new Properties()
Expand All @@ -99,29 +102,28 @@ if (propFile.canRead()) {
}

ext {
annotationVersion = '1.0.0'
appcompatVersion = '1.4.1'
annotationVersion = '1.1.0'
appcompatVersion = '1.7.0'
archCompVersion = '1.1.1'
butterknifeVersion = '10.0.0'
espressoVersion = '3.4.0'
espressoVersion = '3.6.1'
fastlaneVersion = '2.1.1'
firebaseAnalyticsVersion = '20.1.1'
firebaseCrashlyticsVersion = '18.2.9'
fragmentVersion = '1.4.1'
googleServiceAdsVersion = '20.6.0'
firebaseAnalyticsVersion = '22.0.2'
firebaseCrashlyticsVersion = '19.0.3'
fragmentVersion = '1.8.2'
googleServiceAdsVersion = '23.2.0'
junitVersion = '4.13.1'
lifecycleVersion = '2.5.0-alpha04'
materialVersion = '1.5.0'
roomVersion = '2.5.0-alpha01'
testLibVersion = '1.4.0'
uiautomatorVersion = '2.2.0'
lifecycleVersion = '2.8.4'
materialVersion = '1.12.0'
roomVersion = '2.6.1'
testLibVersion = '1.6.1'
uiautomatorVersion = '2.3.0'
}

dependencies {
implementation "androidx.appcompat:appcompat:${appcompatVersion}"
implementation "com.google.android.material:material:${materialVersion}"
implementation "androidx.room:room-runtime:${roomVersion}"
implementation "androidx.lifecycle:lifecycle-livedata:${lifecycleVersion}"
implementation "com.google.firebase:firebase-analytics:${firebaseAnalyticsVersion}"
implementation "com.google.firebase:firebase-crashlytics:${firebaseCrashlyticsVersion}"
implementation "com.jakewharton:butterknife:${butterknifeVersion}"
Expand All @@ -135,7 +137,7 @@ dependencies {
testImplementation "androidx.room:room-testing:${roomVersion}"

androidTestImplementation "androidx.annotation:annotation:${annotationVersion}"
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation "androidx.test:runner:${testLibVersion}"
androidTestImplementation "androidx.test:rules:${testLibVersion}"
androidTestImplementation "androidx.fragment:fragment-testing:${fragmentVersion}"
Expand Down
4 changes: 1 addition & 3 deletions android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<manifest
package="bbct.android.common"
xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
Expand Down
8 changes: 8 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,11 @@ org.gradle.daemon=false
org.gradle.configureondemand=true
android.useAndroidX=true
android.enableJetifier=true

org.gradle.jvmargs=-Xmx1920M \
--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Mar 18 14:13:21 MDT 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Loading