Skip to content

Commit acb3847

Browse files
author
hegaojian
committed
迁移远程仓库从JCenter到Jitpack
1 parent 49b26db commit acb3847

File tree

5 files changed

+10
-25
lines changed

5 files changed

+10
-25
lines changed

JetpackMvvm/build.gradle

+6-16
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-android-extensions'
44
apply plugin: 'kotlin-kapt'
5-
apply plugin: 'com.github.panpf.bintray-publish'
5+
apply plugin: 'com.github.dcendents.android-maven'
6+
group='com.github.hegaojian'
67
android {
78
compileSdkVersion 30
89
buildToolsVersion "30.0.2"
910
defaultConfig {
1011
minSdkVersion 21
1112
targetSdkVersion 30
12-
versionCode 21
13-
versionName "1.2.1"
13+
versionCode 22
14+
versionName "1.2.2"
1415
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1516
consumerProguardFiles 'consumer-rules.pro'
1617
}
@@ -49,22 +50,11 @@ dependencies {
4950
api "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0"
5051
api 'com.kunminx.archi:unpeek-livedata:4.4.1-beta1'
5152
//navigation
52-
api 'androidx.navigation:navigation-runtime-ktx:2.3.1'
53+
api 'androidx.navigation:navigation-runtime-ktx:2.3.2'
5354
//retrofit
5455
api "com.squareup.retrofit2:retrofit:2.9.0"
5556
api "com.squareup.retrofit2:converter-gson:2.9.0"
5657
api 'com.github.franmontiel:PersistentCookieJar:v1.0.1'
5758
//动态替换BaseUrl库 使用可参考 https://github.com/JessYanCoding/RetrofitUrlManager
5859
api 'me.jessyan:retrofit-url-manager:1.4.0'
59-
}
60-
61-
publish {
62-
userOrg = 'hegaojian'//bintray网站中的用户名,网站链接:https://bintray.com/
63-
repoName = 'cxk'//仓库名字 这个可以随便起,比如我觉得我比较菜,所以我取了个蔡徐坤
64-
groupId = 'me.hegj'//路径 名等于“me.hegj.JetpackMvvm:1.0.0”中的 me.hegj,你也可以写com.xxx
65-
artifactId = 'JetpackMvvm'//项目名 等于“me.hegj.JetpackMvvm:1.0.0”中的 JetpackMvvm
66-
publishVersion = '1.2.1'//版本号 等于“me.hegj.JetpackMvvm:1.0.0”中的 1.0.0
67-
desc = 'An Android Jetpack-MVVM framework,JetpackMvvm is nb?'//说明,不重要的东西,随便写
68-
website = 'https://github.com/hegaojian/JetpackMvvm'//项目主页,用GitHub地址
69-
licences = ['Apache-2.0']//协议
70-
}
60+
}

app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ android {
1313
applicationId "me.hgj.jetpackmvvm.demo"
1414
minSdkVersion 21
1515
targetSdkVersion 30
16-
versionCode 21
17-
versionName "1.2.1"
16+
versionCode 22
17+
versionName "1.2.2"
1818
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1919
/* ndk {
2020
// 设置支持的SO库架构 一般只设置这个就阔以设配所有的设备了,还可以减少apk的大小

app/src/main/java/me/hgj/jetpackmvvm/demo/ui/fragment/login/LoginFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class LoginFragment : BaseFragment<LoginRegisterViewModel, FragmentLoginBinding>
3333
override fun layoutId() = R.layout.fragment_login
3434

3535
override fun initView(savedInstanceState: Bundle?) {
36-
36+
addLoadingObserve(requestLoginRegisterViewModel)
3737
mDatabind.viewmodel = mViewModel
3838

3939
mDatabind.click = ProxyClick()

app/src/main/java/me/hgj/jetpackmvvm/demo/viewmodel/request/RequestLoginRegisterViewModel.kt

-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
package me.hgj.jetpackmvvm.demo.viewmodel.request
22

33
import androidx.lifecycle.MutableLiveData
4-
import androidx.lifecycle.asLiveData
5-
import kotlinx.coroutines.delay
6-
import kotlinx.coroutines.flow.Flow
7-
import kotlinx.coroutines.flow.flow
84
import me.hgj.jetpackmvvm.base.viewmodel.BaseViewModel
95
import me.hgj.jetpackmvvm.demo.app.network.apiService
106
import me.hgj.jetpackmvvm.demo.data.model.bean.UserInfo
117
import me.hgj.jetpackmvvm.demo.data.repository.request.HttpRequestCoroutine
128
import me.hgj.jetpackmvvm.ext.request
139
import me.hgj.jetpackmvvm.state.ResultState
14-
import me.jessyan.retrofiturlmanager.RetrofitUrlManager
1510

1611
/**
1712
* 作者 : hegaojian

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
dependencies {
1515
classpath 'com.android.tools.build:gradle:4.1.1'
1616
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
17-
classpath "com.github.panpf.bintray-publish:bintray-publish:1.0.0"
17+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1818
// NOTE: Do not place your application dependencies here; they belong
1919
// in the individual module build.gradle files
2020
}

0 commit comments

Comments
 (0)