Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions .github/workflows/Android-CI-Espresso.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,19 @@ jobs:
abi: [ x86_64 ]
tag: [ 'default' ]
java_version: [ 17 ]
# include:
# - java_version: 17
# os: macOS-14
# api: 31
# abi: arm64-v8a
# tag: 'google_apis'
# include:
# - java_version: 17
# os: macOS-14
# api: 31
# abi: arm64-v8a
# tag: 'google_apis'
steps:
- name: Show architecture
run: uname -a
- name: Checkout
uses: actions/checkout@v6
- uses: actions/checkout@v6
with:
fetch-depth: 0
submodules: true
- name: Install JDK ${{ matrix.java_version }}
uses: actions/setup-java@v5
with:
Expand Down Expand Up @@ -88,8 +90,10 @@ jobs:
os: [ ubuntu-latest ]
java_version: [ 17 ]
steps:
- name: Checkout
uses: actions/checkout@v6
- uses: actions/checkout@v6
with:
fetch-depth: 0
submodules: true
- name: Install JDK ${{ matrix.java_version }}
uses: actions/setup-java@v5
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Android-CI-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
name: Publish release
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v6
- uses: actions/checkout@v6
with:
fetch-depth: 0
submodules: true
- name: Get the version
id: tagger
uses: jimschubert/query-tag-action@v2
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "buildSrc"]
path = buildSrc
url = git@github.com:hannesa2/KotlinBuildSource.git
34 changes: 34 additions & 0 deletions .idea/codeStyles/Project.xml

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

53 changes: 0 additions & 53 deletions LogcatCoreLib/build.gradle

This file was deleted.

54 changes: 54 additions & 0 deletions LogcatCoreLib/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import info.git.versionHelper.getVersionText

plugins {
id("com.android.library")
id("kotlin-android")
id("maven-publish")
}

android {
namespace = "info.hannes.logcat"
defaultConfig {
compileSdk = 36
buildConfigField("String", "VERSION_NAME", "\"${getVersionText()}\"")

minSdk = 23
setProperty("archivesBaseName", "LogcatCore")
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
buildFeatures {
buildConfig = true
}
publishing {
singleVariant("release") {}
}
}

dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.4")
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.9.4")
api("com.jakewharton.timber:timber:5.0.1")
}

afterEvaluate {
publishing {
publications {
create<MavenPublication>("maven") {
from(components["release"])
pom {
licenses {
license {
name = "Apache License Version 2.0"
url = "https://github.com/AppDevNext/Logcat/blob/master/LICENSE"
}
}
}
}
}
}
}
56 changes: 0 additions & 56 deletions LogcatCoreUI/build.gradle

This file was deleted.

57 changes: 57 additions & 0 deletions LogcatCoreUI/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import info.git.versionHelper.getVersionText

plugins {
id("com.android.library")
id("kotlin-android")
id("maven-publish")
}

android {
namespace = "info.hannes.logcat.ui"
defaultConfig {
compileSdk = 36
buildConfigField("String", "VERSION_NAME", "\"${getVersionText()}\"")

minSdk = 23
setProperty("archivesBaseName", "LogcatCoreUI")
}
buildFeatures {
viewBinding = true
buildConfig = true
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
publishing {
singleVariant("release") {}
}
}

dependencies {
api(project(":LogcatCoreLib"))
implementation("androidx.core:core-ktx:1.17.0")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.4")
implementation("androidx.recyclerview:recyclerview:1.4.0")
api("com.google.android.material:material:1.13.0")
}

afterEvaluate {
publishing {
publications {
create<MavenPublication>("maven") {
from(components["release"])
pom {
licenses {
license {
name = "Apache License Version 2.0"
url = "https://github.com/AppDevNext/Logcat/blob/master/LICENSE"
}
}
}
}
}
}
}
45 changes: 0 additions & 45 deletions LogcatCountlyLib/build.gradle

This file was deleted.

Loading