Skip to content

Commit

Permalink
Merge pull request #45 from hannesa2/ArticFox
Browse files Browse the repository at this point in the history
Artic Fox
  • Loading branch information
hannesa2 authored Mar 5, 2021
2 parents 6fab0a8 + 5f331e2 commit b076d0f
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Android-CI-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Install JDK ${{ matrix.java_version }}
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 11.0.3
- name: Install Android SDK
uses: malinskiy/action-android/install-sdk@release/0.1.1
- name: Decrypt keystore
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Android-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: macOS-latest
strategy:
matrix:
java_version: [1.8]
java_version: [ 11.0.3 ]
steps:
- name: Checkout
uses: actions/[email protected]
Expand Down Expand Up @@ -68,10 +68,10 @@ jobs:
uses: actions/[email protected]
with:
fetch-depth: 0
- name: Install JDK 1.8
- name: Install JDK 11.0.3
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 11.0.3
- name: Install Android SDK
uses: malinskiy/action-android/install-sdk@release/0.1.1
- name: Decrypt keystore
Expand Down
20 changes: 4 additions & 16 deletions .idea/codeStyles/Project.xml

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

7 changes: 3 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ buildscript {
ext.kotlin_version = '1.4.31'
repositories {
google()
jcenter()

mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.2'
classpath 'com.android.tools.build:gradle:7.0.0-alpha08'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
}
Expand All @@ -15,7 +14,7 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
maven { url 'https://jitpack.io' }
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 0 additions & 1 deletion library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'com.github.dcendents.android-maven'

android {
compileSdkVersion 30
Expand Down

0 comments on commit b076d0f

Please sign in to comment.