diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 7a05acf0..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,38 +0,0 @@ -version: 2 -jobs: - build: - working_directory: ~/code - docker: - - image: circleci/android:api-29 - tags: - only: /^v.*/ - branches: - ignore: /[^(^master$)]/ - environment: - JVM_OPTS: -Xmx3200m - steps: - - checkout - - restore_cache: - key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} - - run: - name: Chmod permissions #if permission for Gradlew Dependencies fail, use this. - command: sudo chmod +x ./gradlew - - run: - name: Run build - command: export TERM=${TERM:-dumb} && ./gradlew clean build - - run: - name: Download Dependencies - command: ./gradlew androidDependencies - - save_cache: - paths: - - ~/.gradle - key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} - - run: - name: Run Tests - command: ./gradlew lint test - - store_artifacts: - path: app/build/reports - destination: reports - - store_test_results: - path: app/build/test-results -# See https://circleci.com/docs/2.0/deployment-integrations/ for deploy examples diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9129c463..ad675b05 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -12,8 +12,8 @@ android { applicationId = "com.sduduzog.slimlauncher" minSdkVersion(21) targetSdkVersion(30) - versionName = "2.4.15" - versionCode = 49 + versionName = "2.4.16" + versionCode = 50 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { useSupportLibrary = true } signingConfigs { @@ -64,7 +64,7 @@ dependencies { implementation("androidx.core:core-ktx:1.5.0-alpha02") implementation("androidx.fragment:fragment-ktx:1.2.5") implementation("androidx.lifecycle:lifecycle-extensions:2.2.0") - implementation("android.arch.navigation:navigation-fragment:1.0.0") + implementation("androidx.navigation:navigation-fragment-ktx:2.3.0") implementation("androidx.room:room-runtime:2.2.5") implementation("androidx.lifecycle:lifecycle-common-java8:2.2.0") kapt("androidx.room:room-compiler:2.2.5")